Users can now upload profile pictures
Studios can now upload pictures
Fixed profile picture labels
event photo done
Merge branch 'photo_upload' into develop

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