yahoo yahoo
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	hello1/src/com/example/hello1/MainActivity.java