update
Merge branch 'master' of https://github.com/wangym/labs.git

Conflicts:
	android/app-bucket/.classpath