update from sub project
Merge branch 'master' of github.com:avoscloud/avoscloud-demo

Conflicts:
	android/README.md