user able to upload pro pic
Merge branch 'master' into user_profile

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/reviews_controller.rb
	db/schema.rb