Ui update to the rhythm view
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/hanon/app/controller/RhythmController.java