added chats view
Merge branch 'develop' into feature/chat_view_improvements
chatelaines added
Merge branch 'develop' into feature/chat_view_improvements

Conflicts:
	app/views/questions.scala.html
Merge branch 'feature/chat_view_improvements' into develop
files changed
Merge branch 'develop' of https://github.com/VirtualTherapist/virtualtherapist-web into develop

Conflicts:
	app/controllers/UserController.java
	app/models/Chat.java
	app/views/questions.scala.html
Merge branch 'develop' into feature/update_view
pagination added
intellij 14 update