Removed application.conf again
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