Merge branch 'master'  13:30
Merge branch 'master' into zhuchao

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/promote/ebingo/application/HttpConstant.java
	app/src/main/java/com/promote/ebingo/center/ItemDelteDialog.java
	app/src/main/java/com/promote/ebingo/center/MyBookActivity.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/publish/PublishDemand.java
	app/src/main/java/com/promote/ebingo/publish/PublishSupply.java
	app/src/main/res/layout/mydemand_item_layout.xml
18:20
Merge branch 'zhuchao'

Conflicts:
	app/src/main/java/com/promote/ebingo/center/MyPrivilegeActivity.java
	app/src/main/java/com/promote/ebingo/publish/PublishDemand.java
	app/src/main/java/com/promote/ebingo/publish/PublishSupply.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/AndroidManifest.xml