the leon version
Merge branch 'leon' of https://github.com/mccottry/owloutcomes

Conflicts:
	apps/frontend/i18n/messages.en.xml
	apps/frontend/lib/measure/MeasureReporter.php
	apps/frontend/modules/security/templates/account-loginSuccess.php
	apps/frontend/modules/therapist/actions/REST.class.php
	apps/frontend/modules/therapist/actions/actions.class.php
Alice Branch merge. *** warning: config and extra files removed ****