Merge remote-tracking branch 'origin/master'

www/i18n/locale-en.json

www/i18n/locale-fr-FR.json

www/index.html

www/js/controllers.js

www/js/controllers/currency-controllers.js

www/js/controllers/network-controllers.js

www/templates/currency/tabs/view_network.html

www/templates/menu.html

www/templates/network/tabs/view_nodes.html

www/templates/network/view_network.html

www/templates/network/view_peer.html