main template
Merge branch 'master' of https://github.com/mersad00/TUMRentability

Conflicts:
	Rentability/app/controllers/Application.java