增加时间戳
Merge branch 'master' of https://github.com/pandorajs/pandora

Conflicts:
	src/pandora.js