- Template tests finished
- Views adjusted
Merge branch 'develop' of https://github.com/VirtualTherapist/virtualtherapist-web into develop

Conflicts:
	app/views/analysis.scala.html
	app/views/index.scala.html
	test/TemplateTest.java