from eclipse
Merge branch 'master' into ui

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