user_profile fixes
Merge branch 'master' of https://github.com/rwihaib/Ribbons

Conflicts:
	user_profile.html