Updated date
Merge branch 'master' of github.com:citizensense/SensorServe

Conflicts:
	static/js/.ant.js.swp
	status.json
Updated .gitignore