Merge pull request #9 from bradoyler/master

fix .merge error and upgrade Ember \ Handlebars
added actions hashes to controllers
Revert "remove the action related deprecation warnings"

This reverts commit abbd7e14f8c0ddc53f5d3d13a5eb80d71d41d2e1.
rebase from master closes #1
Merge pull request #1 from GavinJoyce/master

rebase
add mute\unmute methods
Merge branch 'channel-mute'

# By brad oyler (3) and Gavin Joyce (1)
# Via brad oyler (2) and Gavin Joyce (1)
* channel-mute:
  add mute\unmute methods
  rebase from master closes #1
  Revert "remove the action related deprecation warnings"
  added actions hashes to controllers

Conflicts:
	app/controllers/channel.js
	app/controllers/channels.js
	app/controllers/playback.js
	app/controllers/song.js