Initial State Test
Initial State Test (Merge)
rebuilt Task and TaskSheet; comments to come
finished rebuilt; working; comments to come
Merge branch 'rebuild'
Fixed merge from rebuild

Conflicts:
	app/controllers/Application.java
	app/views/showLectures.scala.html
	conf/routes