username reminder implemented
Merge branch 'master' into usernamereminder
Delted files left over from merge conflict
Merge branch 'master' into usernamereminder
Merge branch 'master' of https://github.com/StyleASD/team_citadel

Conflicts:
	app/controllers/UsersController.php