会员制度
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/promote/ebingo/InformationActivity/ProductInfoActivity.java
	app/src/main/res/values/strings.xml