list页login
Merge branch 'master' of https://github.com/SmartEXPO/SmartEXPO

Conflicts:
	SmartEXPO_Proj_new/web/item.xhtml
	SmartEXPO_Proj_new/web/resources/theme1/1_0/scripts/item_effect.js