L
Merge branch 'master' of git@github.com:liaojia/LKOA4Android.git
Merge branch 'master' of git@github.com:liaojia/LKOA4Android.git

Conflicts:
	src/com/lkoa/activity/AuditActivity.java
	src/com/lkoa/activity/XMGLDetailActivity.java