fix?
Merge branch 'master' of https://github.com/simonlast/popcorn-music

Conflicts:
	client/client.js