commit
item
Merge branch 'master' of https://github.com/SmartEXPO/SmartEXPO

Conflicts:
	SmartEXPO_Proj_new/nbproject/private/private.properties
	SmartEXPO_Proj_new/web/admin/item_view.xhtml
	SmartEXPO_Proj_new/web/resources/theme1/1_0/scripts/index_effect.js