edit后commit仍然有问题
Merge branch 'master' of https://github.com/SmartEXPO/SmartEXPO

Conflicts:
	SmartEXPO_Proj_new/src/java/com/smartexpo/temp/Item.java
	SmartEXPO_Proj_new/src/java/com/smartexpo/temp/ItemViewManagedBean.java
	SmartEXPO_Proj_new/src/java/com/smartexpo/temp/UserViewManagedBean.java
	SmartEXPO_Proj_new/web/admin/user_view.xhtml
Merge branch 'master' of https://github.com/SmartEXPO/SmartEXPO