Merge branch 'patch-7' of https://github.com/Chaos514/NemCommunityClient into Chaos514-patch-7

Conflicts:
	nem-client-api/src/main/webapp/scripts/languages/french.js
Merge branch 'Chaos514-patch-7'
Merge branch 'patch-7' of https://github.com/Chaos514/NemCommunityClient into Chaos514-patch-7

Conflicts:
	nem-client-api/src/main/webapp/scripts/languages/french.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	nem-client-api/src/main/webapp/scripts/languages/french.js