update

update
Revert "update"

This reverts commit 77c4ec9863e41371795fc17204b41d4b8aa0c79d.
top
Sync

sync
Merge branch 'master' of https://github.com/xember/android

Conflicts:
	index.html
	res/apphandlers.js
	res/style.css