modify index.html index.js
Merge branch 'master' of https://www.github.com/yisuren/nodetest

Conflicts:
	express/public/index.js
add datapicker test