wdwd
Merge branch 'test-state' of https://github.com/dominik1991jahn/tagebuchwebapp into test-state
Merge branch 'test-state' of https://github.com/dominik1991jahn/tagebuchwebapp into test-state

Conflicts:
	Cache/GetScheduleForClass/bfi11a/2014-07-21.json
	Cache/GetTeacherList.json