COMMIT BIATCHES
Merge branch 'master' of https://github.com/LionKingKlubburinn/Translation

Conflicts:
	Controllers/TranslationController.cs
	Views/Translation/View.cshtml