finished first part of therapy group
Merge branch 'master' of https://github.com/luukgruijs/project6

Conflicts:
	front-end/www/js/controller_exerciseDetailPage.js