fix
Merge branch 'master' of https://github.com/hunterbmt/xml_project
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/ckeditor.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/config.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/contents.css
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/_translationstatus.txt
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/af.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/ar.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/bg.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/bn.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/bs.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/ca.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/cs.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/cy.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/da.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/de.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/el.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/en-au.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/en-ca.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/en-gb.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/en.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/eo.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/es.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/et.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/eu.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/fa.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/fi.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/fo.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/fr-ca.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/fr.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/gl.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/gu.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/he.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/hi.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/hr.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/hu.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/is.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/it.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/ja.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/ka.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/km.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/ko.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/ku.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/lt.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/lv.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/mk.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/mn.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/ms.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/nb.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/nl.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/no.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/pl.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/pt-br.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/pt.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/ro.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/ru.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/sk.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/sl.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/sr-latn.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/sr.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/sv.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/th.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/tr.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/ug.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/uk.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/vi.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/zh-cn.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/lang/zh.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/da.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/el.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/es.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/et.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/he.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/it.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/km.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/no.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/th.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/about/dialogs/about.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/about/dialogs/logo_ckeditor.png
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/clipboard/dialogs/paste.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/dialog/dialogDefinition.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/fakeobjects/images/spacer.gif
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/icons.png
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/image/dialogs/image.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/image/images/noimage.png
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/link/dialogs/anchor.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/link/dialogs/link.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/link/images/anchor.png
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/magicline/images/icon.png
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/pastefromword/filter/default.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/scayt/LICENSE.md
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/scayt/dialogs/options.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/scayt/dialogs/toolbar.css
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/specialchar/dialogs/lang/ca.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/specialchar/dialogs/lang/cs.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/specialchar/dialogs/lang/cy.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/specialchar/dialogs/lang/de.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/specialchar/dialogs/lang/el.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/specialchar/dialogs/lang/en.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/specialchar/dialogs/lang/eo.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/specialchar/dialogs/lang/et.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/specialchar/dialogs/lang/fa.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/specialchar/dialogs/lang/fi.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/specialchar/dialogs/lang/fr.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/specialchar/dialogs/lang/he.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/specialchar/dialogs/lang/hr.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/specialchar/dialogs/lang/it.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/specialchar/dialogs/lang/ku.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/specialchar/dialogs/lang/lv.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/specialchar/dialogs/lang/nb.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/specialchar/dialogs/lang/nl.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/specialchar/dialogs/lang/no.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/specialchar/dialogs/lang/pl.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/specialchar/dialogs/lang/sk.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/specialchar/dialogs/lang/sv.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/specialchar/dialogs/lang/th.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/specialchar/dialogs/lang/tr.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/specialchar/dialogs/lang/ug.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/specialchar/dialogs/specialchar.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/table/dialogs/table.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/tabletools/dialogs/tableCell.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/wsc/LICENSE.md
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/wsc/dialogs/ciframe.html
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/wsc/dialogs/wsc.css
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/plugins/wsc/dialogs/wsc.js
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/skins/moono/dialog.css
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/skins/moono/dialog_ie.css
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/skins/moono/dialog_ie7.css
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/skins/moono/dialog_ie8.css
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/skins/moono/dialog_iequirks.css
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/skins/moono/dialog_opera.css
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/skins/moono/editor.css
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/skins/moono/editor_gecko.css
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/skins/moono/editor_ie.css
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/skins/moono/editor_ie7.css
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/skins/moono/editor_ie8.css
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/skins/moono/editor_iequirks.css
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/skins/moono/icons.png
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/skins/moono/images/arrow.png
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/skins/moono/images/close.png
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/skins/moono/images/mini.png
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/skins/moono/readme.md
	deleted:    src/main/webapp/WEB-INF/views/resources/js/lib/ckeditor/styles.js
	modified:   src/main/java/com/vteam/xml_project/hibernate/dao/ProductDAO.java
	modified:   src/main/webapp/WEB-INF/views/admin_product.jsp
	modified:   src/main/webapp/WEB-INF/views/resources/js/admin_product.js
	modified:   src/main/webapp/WEB-INF/views/resources/js/lib/prettify.js
	modified:   src/main/webapp/WEB-INF/views/resources/js/vteam.js
bla bla
Merge branch 'master' of https://github.com/hunterbmt/xml_project