matching backend with message passing
Merge branch 'master' of https://github.com/tambien/MakeMeDance

Conflicts:
	client/scripts/app/songs/HipHop.js
	client/scripts/app/songs/PopSongs.js