win7
Merge branch 'master' of https://github.com/xiongxt/desktop

Conflicts:
	sea-modules/page.js