umeng.jar
merge
Merge branch 'official' of https://github.com/txfan/smart-logistics.git
into official

Conflicts:
	android/FreightApp/src/com/freightapp/activity/FreightMainActivity.java