Edit profile implemented
EDIT PROFILE MERGED WITH MASTER
Merge branch 'editprofile'

Conflicts:
	app/controllers/UsersController.php
	app/views/password/remind.blade.php