socket-io fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/javascripts/controllers.js