Improved controllers and locale
Merge branch 'master' of https://github.com/jennynilsson/LivingWeb

Conflicts:
	css/common.css