Merge branch 'master' of https://github.com/mar10/jquery-ui-contextmenu

Conflicts:
demo/index.html
merge