Changed Login Form

Translation added
Merge branch 'master' of https://github.com/ServerJunge/serverjunge

Conflicts:
	Gemfile.lock