Design improved
Merge branch 'master' of https://github.com/VirtualTherapist/virtualtherapist-web

Conflicts:
	app/controllers/QuestionController.java
	app/views/analysis.scala.html
	app/views/main.scala.html
	conf/routes
Merge branch 'master' of https://github.com/VirtualTherapist/virtualtherapist-web

Conflicts:
	build.sbt
	test/ApplicationTest.java