Complete all store class
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/encodings.xml
	.idea/workspace.xml
	web/vip/main.jsp
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	web/test/csszen/index.jsp
	web/vip/main.jsp
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	web/test/csszen/index.jsp
	web/vip/main.jsp