Fixed bug with devise edit profile
Merged changes