routes & main
Merge branch 'master' of https://github.com/MKaettner/web-tech

Conflicts:
	teilleistung3/flexlater/app/views/main.scala.html