Add photo to score.
Merge branch 'develop' into front

Conflicts:
	app/controllers/users_controller.rb