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

Conflicts:
	SmartEXPO_Proj_new/src/java/com/smartexpo/controls/InsertItemServlet.java
no message