找回密码，各种删除列表，发布供应bug处理，细节处理。
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/promote/ebingo/InformationActivity/ProductInfoActivity.java
Merge branch 'promote_branch' of https://github.com/Ebingo/Ebingo
搜索界面功能完善。
click_gray_bg
进入企业 id
bean
企业设置，企业资料，一些bug修复和页面调整
企业设置，企业资料，一些bug修复和页面调整
企业设置，企业资料，一些bug修复和页面调整
更新产品详情
Merge branch 'promote_branch'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/promote/ebingo/BaseListActivity.java
	app/src/main/java/com/promote/ebingo/InformationActivity/ProductInfoActivity.java
	app/src/main/java/com/promote/ebingo/MainActivity.java
	app/src/main/java/com/promote/ebingo/bean/Company.java
	app/src/main/java/com/promote/ebingo/bean/SearchSupplyBean.java
	app/src/main/java/com/promote/ebingo/center/CenterFragment.java
	app/src/main/java/com/promote/ebingo/center/MyCollectionActivity.java
	app/src/main/java/com/promote/ebingo/center/MyDemandActivity.java
	app/src/main/java/com/promote/ebingo/center/MySupplyActivity.java
	app/src/main/java/com/promote/ebingo/center/settings/EnterpriseSettingActivity.java
	app/src/main/java/com/promote/ebingo/publish/PickRegionActivity.java
	app/src/main/java/com/promote/ebingo/publish/PublishDemand.java
	app/src/main/java/com/promote/ebingo/publish/PublishSupply.java
	app/src/main/java/com/promote/ebingo/publish/login/LoginManager.java
	app/src/main/java/com/promote/ebingo/util/ImageUtil.java
	app/src/main/res/layout/activity_product_info.xml
	app/src/main/res/layout/common_head_search_layout.xml
	app/src/main/res/layout/login_dialog.xml
	app/src/main/res/layout/preview_activity.xml
	app/src/main/res/layout/publish_supply.xml
	app/src/main/res/values/titles.xml
详情页空指针问题
下拉刷新
完善企业详情
Merge branch 'promote_branch'
Merge remote-tracking branch 'origin/master'
下拉刷新
Merge remote-tracking branch 'origin/master'
下拉刷新