货代端公共货源 货源收藏功能，我的货源-收藏-取消收藏功能的添加
合并
Merge branch 'official' of https://github.com/txfan/smart-logistics.git
into official

Conflicts:
	android/FreightApp/src/com/freightapp/Constants.java
合并