Fix bug.
Merge branch 'develop' into front

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