Merge branch 'master' into change-password-email

Conflicts:
	services.php
Merge pull request #32 from synapsestudios/change-password-email

Change Email or Password
Merge branch 'master' into email-jobs