项目历史加更多
Merge branch 'master' of https://github.com/liaojia/LKOA4Android

Conflicts:
	src/com/lkoa/activity/XMGLHistoryListActivity.java
	src/com/lkoa/activity/XMGLListActivity.java