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

Conflicts:
	SmartEXPO_Proj_new/web/admin/login.xhtml
item insert
Merge branch 'master' of https://github.com/SmartEXPO/SmartEXPO

Conflicts:
	SmartEXPO_Proj_new/web/admin/login.xhtml
	SmartEXPO_Proj_new/web/resources/theme1/1_0/admin/css/style.css