规范化代码，同时完善js时间处理辅助函数
Merge branch 'master' of https://github.com/jackrain/webpos

Conflicts:
	program.js