Fixed login issues
Merge branch 'master' of github.com:Kleanthis-Limnatis/Grades-School-Project

Conflicts:
	app/views/main.scala.html