resource removal
merge conflicts
changed timetable route
Merge branch 'master' of https://github.com/FHK-ADV/lwm into development

Conflicts:
	app/controllers/TimeTableController.scala
	app/models/LabWorks.scala
	app/views/tableRow.scala.html
	app/views/timeTable.scala.html
	app/views/timeTableManagement.scala.html