Updated internationalization and app config
Merge branch 'master' of https://github.com/nupmmarkbegale/conemo_app

Conflicts:
	app/scripts/controllers/main.js