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

Conflicts:
	SmartEXPO_Proj/build/web/WEB-INF/classes/META-INF/persistence.xml
	SmartEXPO_Proj/build/web/WEB-INF/classes/com/smartexpo/controls/InsertItemServlet.class
	SmartEXPO_Proj/src/conf/persistence.xml

Use Codinfox's configuration and to be modified.