Fixing view of profile edit
Merge branch 'feature/social_bugs_fix_79' into staging

Conflicts:
	Gemfile