#sup-50 fixed work 20m
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/javascripts/lib/dance_styles.js.coffee