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

Conflicts:
	app/views/signup.blade.php
fix signup view
Merge branch 'UI'
Merge branch 'master' into UI
Merge branch 'UI' of https://github.com/puttpotsawee/perdtye2 into UI