readme
Merge branch 'liugu-dev' into beta
Merge branch 'beta' of https://github.com/yuhongjie/airone into beta

Conflicts:
	README.md