Added keywordtrends.scala.html file and route
Merge branch 'develop' of https://github.com/VirtualTherapist/virtualtherapist-web into feature/25/keyword-view
Trending keyword view
Merge branch 'feature/25/keyword-view' into develop
Removed application.conf again
Merge branch 'master' into develop

Conflicts:
	conf/application.conf
Updated chatlist with chat rating.
Merge branch 'feature/86' into develop
Feature 68 en 69 afgerond, je krijgt nu questions aan de hand van de
keywords
Merge branch 'develop' of https://github.com/VirtualTherapist/virtualtherapist-web into develop

Conflicts:
	.gitignore
Merge branch 'develop' into feature/feature68-69
Merge branch 'feature/feature68-69' into develop
New tests cases and structure
Implement route to api/rating.
stupid branches
Removed unused imports. Removed commented codeblocks. Fixed styling.
Added 'sbt test' to travis script.
Merge branch 'develop' of github.com:VirtualTherapist/virtualtherapist-web into develop
Removed 'sbt test' from travis script.
Fixed route to api docs. Fixed check if user is chat owner. Added debug statements.