merge failed
Merge branch 'promote_branch'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/promote/ebingo/application/HttpConstant.java
	app/src/main/java/com/promote/ebingo/publish/login/EnterpriseSettingActivity.java
	app/src/main/java/com/promote/ebingo/publish/login/LoginDialog.java