Stand 141114
151114 contact.scala.html </html> hat gefehlt
151114: bootstrap update
Merge branch 'dev_kay' of https://github.com/toka-htwg/ToKa_hotel-rating
no message
Merge branch 'dev_kay' of https://github.com/toka-htwg/ToKa_hotel-rating
171114: dev_kay to master
Merge branch 'master' of https://github.com/toka-htwg/ToKa_hotel-rating
171114: dev_kay to master
Merge branch 'dev_tobi'

Conflicts:
	public/stylesheets/bootstrap.min.customized.css
Testcommit
Merge branch 'dev_tobi'

Conflicts:
	app/views/index.scala.html