Merge remote-tracking branch 'upstream/master'

config.xml

doc/deploy.md

doc/fr/development_tutorial-01.md

doc/fr/development_tutorial-02.md

doc/fr/development_tutorial-03.md

doc/fr/development_tutorial-04.md

doc/fr/development_tutorial.md

install.sh

package.json

www/i18n/locale-en-GB.json

www/i18n/locale-en.json

www/i18n/locale-fr-FR.json

www/i18n/locale-nl-NL.json

www/js/config.js

www/js/controllers/currency-controllers.js

www/js/controllers/network-controllers.js

www/js/entities/peer.js

www/js/services/bma-services.js

www/js/services/network-services.js

www/templates/currency/items_network.html