Add popcorn logic
Merge branch 'master' of github.com:simonlast/popcorn-music

Conflicts:
	client/circles.js
	popcorn-music.html