test

Signed-off-by: kollega <ko11ega@bk.ru>
Merge branch 'master' of github.com:ko11ega/mindmap

Conflicts:
	contextmenu/README.md
	contextmenu/contextMenu.jquery.json
	contextmenu/demo.html
	contextmenu/demo/accesskeys.html
	contextmenu/demo/async-create.html
	contextmenu/demo/callback.html
	contextmenu/demo/custom-command.html
	contextmenu/demo/disabled-callback.html
	contextmenu/demo/disabled-changing.html
	contextmenu/demo/disabled-menu.html
	contextmenu/demo/disabled.html
	contextmenu/demo/dynamic-create.html
	contextmenu/demo/dynamic.html
	contextmenu/demo/html5-import.html
	contextmenu/demo/html5-polyfill-firefox8.html
	contextmenu/demo/html5-polyfill.html
	contextmenu/demo/input.html
	contextmenu/demo/keeping-contextmenu-open.html
	contextmenu/demo/menu-title.html
	contextmenu/demo/on-dom-element.html
	contextmenu/demo/sub-menus.html
	contextmenu/demo/trigger-custom.html
	contextmenu/demo/trigger-hover-autohide.html
	contextmenu/demo/trigger-hover.html
	contextmenu/demo/trigger-left-click.html
	contextmenu/demo/trigger-swipe.html
	contextmenu/docs.html
	contextmenu/index.html
	contextmenu/jquery-1.8.2.min.js
	contextmenu/jquery.touchSwipe.min.js
	contextmenu/package.json
	contextmenu/prettify/lang-apollo.js
	contextmenu/prettify/lang-clj.js
	contextmenu/prettify/lang-css.js
	contextmenu/prettify/lang-go.js
	contextmenu/prettify/lang-hs.js
	contextmenu/prettify/lang-lisp.js
	contextmenu/prettify/lang-lua.js
	contextmenu/prettify/lang-ml.js
	contextmenu/prettify/lang-n.js
	contextmenu/prettify/lang-proto.js
	contextmenu/prettify/lang-scala.js
	contextmenu/prettify/lang-sql.js
	contextmenu/prettify/lang-tex.js
	contextmenu/prettify/lang-vb.js
	contextmenu/prettify/lang-vhdl.js
	contextmenu/prettify/lang-wiki.js
	contextmenu/prettify/lang-xq.js
	contextmenu/prettify/lang-yaml.js
	contextmenu/prettify/prettify.css
	contextmenu/prettify/prettify.js
	contextmenu/prettify/prettify.sunburst.css
	contextmenu/screen.css
	contextmenu/screen.js
	contextmenu/screenshots/jquery-contextMenu.png
	contextmenu/screenshots/jquery-contextMenu.subs.png
	contextmenu/screenshots/native.firefox-9.0a1.png
	contextmenu/src/images/cut.png
	contextmenu/src/images/door.png
	contextmenu/src/images/page_white_add.png
	contextmenu/src/images/page_white_copy.png
	contextmenu/src/images/page_white_delete.png
	contextmenu/src/images/page_white_edit.png
	contextmenu/src/images/page_white_paste.png
	contextmenu/src/jquery.contextMenu.css
	contextmenu/src/jquery.contextMenu.js
	contextmenu/src/jquery.ui.position.js
	cross.png
	js/jquery-ui-1.10.3.custom.min.js
	js/jquery.jsPlumb-1.4.1-all.js