work on api -- add screen to channels
Merge branch 'master' of github.com:screencloud/screencloud-node

Conflicts:
	app.coffee