Notification system
Email sending now working
Merge branch 'develop' into api-oauth

Conflicts:
	composer.json