Fixed minification issues.
Merge remote-tracking branch 'origin/master'

Conflicts:
	sample_app/app/assets/javascripts/modules/alarm/alarm.js