datetime jscript sort of working
Merge branch 'master' of https://github.com/bearblock/cmsame

Conflicts:
	cmsame/res/cmsame.js