renamed language directories to ICU standard, upgrade script, no longer promoting english at top of list in languages tab, en now en_GB, encompasses Canadian and English English
Merge branch 'master' of github.com:designcreateplay/NodeBB

Conflicts:
	src/routes/api.js