Merge branch 'i18n-momentjs' of https://github.com/thierrytiti/converse.js into thierrytiti-i18n-momentjs

Conflicts:
	converse.js

Also refactored the code to adhere to the style guide.