由明阳
Merge branch 'master' of https://github.com/fengsaofly/HandWrite

Conflicts:
	project.properties
	src/scu/android/activity/NativePhotosActivity.java
	src/scu/android/activity/ScanPhotosActivity.java
	src/scu/android/application/MyApplication.java