update the logic for cal
update the logic for cal
update the logic for cal
Merge branch 'master' of https://github.com/msdc/wirelessSensor

Conflicts:
	app.io.js
	public/demo.socket.io.client.html
Merge branch 'master' of https://github.com/msdc/wirelessSensor

Conflicts:
	app.io.js
	public/demo.socket.io.client.html