edit3
Merge branch 'master' of https://github.com/dloveao-test/test4git

Conflicts:
	src/com/nedu/android_ui_16/Android_UI_16Activity.java