Update
Merge branch 'master' of https://github.com/sydcanem/bootstrap-contextmenu

Conflicts:
	bootstrap-contextmenu.js