Added test/BaseTest.java. Added super class BaseTest to UserTest.
Added tests for deleteQuestion and updateQuestion in QuestionController. Fixed typo. Added question fixture.
Merge branch 'develop' of github.com:VirtualTherapist/virtualtherapist-web into develop
Merge branch 'develop' of github.com:VirtualTherapist/virtualtherapist-web into develop
Added implementation ChatController. Created chat views.
Fixed config.
Fixed chat views and chat controller. Ignored QuestionTest tests.
Merge branch 'develop' of github.com:VirtualTherapist/virtualtherapist-web into develop

Conflicts:
	conf/application.conf
Merge branch 'develop' of github.com:VirtualTherapist/virtualtherapist-web into develop

Conflicts:
	conf/application.conf
Merge branch 'develop' into feature/61
Ignored a few test to get online.
Merge branch 'feature/61' into develop
Merge branch 'develop' of github.com:VirtualTherapist/virtualtherapist-web into develop

Conflicts:
	app/views/main.scala.html
	conf/application.conf