iOS  链接 socketio  api
Merge branch 'master' of https://github.com/r2space/DiandianWeb

Conflicts:
	websocket.js