Style added
Merge branch 'master' of https://github.com/VirtualTherapist/virtualtherapist-web

Conflicts:
	app/views/main.scala.html
	conf/evolutions/default/1.sql
Merge conflict solved
Merge branch 'master' of https://github.com/VirtualTherapist/virtualtherapist-web

Conflicts:
	conf/application.conf
	conf/evolutions/default/1.sql