bugfixing no translation on login
Merge branch 'master' of github.com:Phosphoros/mate-app

Conflicts:
	server/startup.js