Add Date
Merge branch 'master' of https://github.com/andyzhuangyy/2014hackathon

Conflicts:
	README.md
Merge branch 'master' of https://github.com/andyzhuangyy/2014hackathon

Conflicts:
	README.md
Merge branch 'master' of https://github.com/andyzhuangyy/2014hackathon

Conflicts:
	map/.pos.js.swp
Merge branch 'master' of https://github.com/andyzhuangyy/2014hackathon