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

Conflicts:
	SSEDemo/nbproject/private/private.properties
	SmartEXPO_Proj/build/web/WEB-INF/classes/com/smartexpo/controls/InsertItemServlet.class
	SmartEXPO_Proj/build/web/WEB-INF/classes/com/smartexpo/models/Audio_.class
	SmartEXPO_Proj/build/web/WEB-INF/classes/com/smartexpo/models/Author_.class
	SmartEXPO_Proj/build/web/WEB-INF/classes/com/smartexpo/models/Comment_.class
	SmartEXPO_Proj/build/web/WEB-INF/classes/com/smartexpo/models/Description_.class
	SmartEXPO_Proj/build/web/WEB-INF/classes/com/smartexpo/models/DisplayColumn_.class
	SmartEXPO_Proj/build/web/WEB-INF/classes/com/smartexpo/models/ItemAudio_.class
	SmartEXPO_Proj/build/web/WEB-INF/classes/com/smartexpo/models/ItemAuthor_.class
	SmartEXPO_Proj/build/web/WEB-INF/classes/com/smartexpo/models/ItemComment_.class
	SmartEXPO_Proj/build/web/WEB-INF/classes/com/smartexpo/models/ItemDisplayColumn_.class
	SmartEXPO_Proj/build/web/WEB-INF/classes/com/smartexpo/models/ItemVideo_.class
	SmartEXPO_Proj/build/web/WEB-INF/classes/com/smartexpo/models/Item_.class
	SmartEXPO_Proj/build/web/WEB-INF/classes/com/smartexpo/models/ManagerPermission_.class
	SmartEXPO_Proj/build/web/WEB-INF/classes/com/smartexpo/models/Manager_.class
	SmartEXPO_Proj/build/web/WEB-INF/classes/com/smartexpo/models/Permission_.class
	SmartEXPO_Proj/build/web/WEB-INF/classes/com/smartexpo/models/Video_.class
add item url
Merge branch 'master' of https://github.com/SmartEXPO/SmartEXPO

Conflicts:
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/META-INF/persistence.xml
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/com/smartexpo/controls/GetInfo.class
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/com/smartexpo/controls/InsertItemServlet.class
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/com/smartexpo/controls/InsertManagerServlet.class
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/com/smartexpo/jpgcontrollers/AudioJpaController.class
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/com/smartexpo/jpgcontrollers/DescriptionJpaController.class
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/com/smartexpo/jpgcontrollers/ItemAudioJpaController.class
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/com/smartexpo/jpgcontrollers/ItemVideoJpaController.class
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/com/smartexpo/jpgcontrollers/VideoJpaController.class
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/com/smartexpo/models/Audio.class
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/com/smartexpo/models/Audio_.class
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/com/smartexpo/models/Author.class
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/com/smartexpo/models/Author_.class
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/com/smartexpo/models/Comment.class
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/com/smartexpo/models/Comment_.class
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/com/smartexpo/models/Description.class
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/com/smartexpo/models/Description_.class
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/com/smartexpo/models/Item.class
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/com/smartexpo/models/ItemAudio.class
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/com/smartexpo/models/ItemAudio_.class
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/com/smartexpo/models/ItemAuthor.class
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/com/smartexpo/models/ItemAuthor_.class
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/com/smartexpo/models/ItemComment.class
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/com/smartexpo/models/ItemComment_.class
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/com/smartexpo/models/ItemVideo.class
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/com/smartexpo/models/ItemVideo_.class
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/com/smartexpo/models/Item_.class
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/com/smartexpo/models/Manager.class
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/com/smartexpo/models/ManagerPermission.class
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/com/smartexpo/models/ManagerPermission_.class
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/com/smartexpo/models/Manager_.class
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/com/smartexpo/models/Permission.class
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/com/smartexpo/models/Permission_.class
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/com/smartexpo/models/Video.class
	SmartEXPO_Proj_new/build/web/WEB-INF/classes/com/smartexpo/models/Video_.class
	SmartEXPO_Proj_new/build/web/resources/theme1/1_0/scripts/item_effect.js