Added table
Merge branch 'master' of https://github.com/FHK-ADV/lwm into WIP_User_Management

Conflicts:
	app/models/LabWorks.scala
Primitive timetable
Changed 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
Merge branch 'master' of https://github.com/FHK-ADV/lwm into development

Conflicts:
	app/controllers/TimeTableController.scala
	app/models/LabWorks.scala
	app/models/Timetables.scala
	app/views/tableRow.scala.html
	app/views/timeTable.scala.html
	app/views/timeTableManagement.scala.html
Merge branch 'master' of https://github.com/FHK-ADV/lwm into development

Conflicts:
	app/controllers/TimetableController.scala
	app/models/LabWorks.scala
	app/models/Timetables.scala
Merge branch 'master' of https://github.com/FHK-ADV/lwm into development
Resources... resources everywhere
Resources... resources everywhere
Entries fixed
Entries fixed
Slight modification
Merge remote-tracking branch 'avram/development'
Async 4tw.

Controllers wait for DB transactions now .