現在の最新をpush
Merge branch 'develop' into front

Conflicts:
	app/controllers/users_controller.rb
Merge branch 'develop' into front

Conflicts:
	app/views/users/_user_score.html.erb
Merge branch 'front' of github.com:Meet-Up/pictance into develop
Merge branch 'develop' of github.com:Meet-Up/pictance into develop
Fix loading page.