Update client to be consistent with passport branch
Merge branch 'master' into socketio

Conflicts:
	bower.json
	client/app/app.js
	client/app/main/main.html
	client/index.html
Improve interface for socket.io demo
Add comments to socket sync