Changed translations to have better keys

Conflicts:
	client/i18n/en.i18n.js
Added generic navigation template
Added basic popup layouts
Added dialog layouts