Issue #52, edit routes
Merge branch 'C4_Gezeery_#197_edit_user_profile' into C4_Gezeery_#52_view_user_profile2

Conflicts:
	Idearator/Gemfile
Merge pull request #199 from DevYah/C4_Gezeery_#52_view_user_profile2

C4 gezeery #52 view user profile2  Merged :D :D