Revert "udate"

This reverts commit 15369e1e731fbbe441c546e163b1e851bbf6c84c.
1

1
Merge remote-tracking branch 'origin/master'

Conflicts:
	chrome/pageshot/popup.js
	chrome/pageshot/run.js