Merge branch 'master' of https://github.com/windprog/appengine

Conflicts:
	README.md
修改说明
Merge branch 'master' of https://github.com/windprog/appengine

Conflicts:
	README.md