升级highslide-4.1.13
 hightslide update to hightslide4.1.13
清理HOTEL代码
清理垃圾代码
CONFILT FIX
erge branch 'master' of https://github.com/AAATEAM/ea

Conflicts:
	ea-template/src/main/webapp/pmenu.ftl