error message localization now works
Merge branch 'master' into tmp1

Conflicts:
	JohannesVidnerProject/Controllers/HomeController.cs
error message localization now works