Commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/kla/faceinfo_ui1/MainActivity.java