Email Controller More
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/signup.blade.php