Updated UI of the profile
Merge branch 'master' of github.com:sbauch/fourplay

Conflicts:
	app/views/users/show.html.erb