ConfigMeberControl
e
fixed untracked file
Revert "e"

This reverts commit b12701243fefa43ae86868a754bc911abcc34da8.

Conflicts:
	app/config/database.php
Login Controller
upgrade Model
Set Email
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/routes.php