Unit Tests
Merge branch 'origin/master'

Conflicts:
	app/tests/unit/UserTest.php
Mail Change OK