Switch to newer chrome.sockets API version
Fix the way new sockets API is invoked
Merge branch 'master' into new-sockets

Conflicts:
	app/js/services.js
	app/manifest.json