user-panel in profile page has been improved graphically.
Merge remote-tracking branch 'origin/master'

Conflicts:
	user_profile/templates/profile.html