update socketevent
'solve conflict'
Merge branch 'master' of https://github.com/Lina128/canalytics

Conflicts:
	.DS_Store
	public/.DS_Store
	public/javascripts/capeople.js