i18n for all templates completed, jsons for german added
Update global.json
Merge branch 'master' of github.com:BudickDa/NodeBB into BudickDa-master

Conflicts:
	public/language/en/global.json
fixing up some translations - WIP
fixed last couple tweaks, ready t'merge