Email Controller
add Member Token
start layouting
Merge remote-tracking branch 'origin/membersystem'

Conflicts:
	app/routes.php