1.新增附近运力
1.解决我的车队底部信息未显示问题
1.解决代码冲突
Merge branch 'official' of https://github.com/txfan/smart-logistics.git
into official

Conflicts:
	android/FreightApp/res/layout/my_motorcade_layout.xml
	android/FreightApp/src/com/freightapp/model/ListAbstractModel.java