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

Conflicts:
	demo/index.html
	ui-contextmenu.jquery.json

Author: mar10

ui-contextmenu.jquery.json

@@ -1,26 +1,21 @@
 {
   "name": "ui-contextmenu",
   "title": "jQuery UI context menu plugin",
-  "description": "jQuery UI plugin that turns a jQuery UI Menu widget into a context menu.",
+  "description": "Turns a jQuery UI Menu widget into a context menu.",
   "version": "0.2.0",
   "homepage": "https://github.com/mar10/jquery-ui-contextmenu",
   "author": {
 	"name": "Martin Wendt",
-	"url": "http://careers.stackoverflow.com/martin-wendt"
+	"email": "jquery@wwwendt.de",
+    "url": "http://careers.stackoverflow.com/martin-wendt"
   },
   "repository": {
 	"type": "git",
 	"url": "https://github.com/mar10/jquery-ui-contextmenu"
   },
-  "demo": {
-	"url": "http://wwwendt.de/tech/demo/jquery-contextmenu/demo/"
-  },
-  "docs": {
-	"url": "https://github.com/mar10/jquery-ui-contextmenu/blob/master/README.md"
-  },
-  "bugs": {
-	"url": "https://github.com/mar10/jquery-ui-contextmenu/issues"
-  },
+  "demo": "http://wwwendt.de/tech/demo/jquery-contextmenu/demo/",
+  "docs": "https://github.com/mar10/jquery-ui-contextmenu/blob/master/README.md",
+  "bugs": "https://github.com/mar10/jquery-ui-contextmenu/issues",
   "licenses": [
 	{
 	  "type": "MIT",
@@ -31,5 +26,5 @@
 	"jquery": ">=1.7",
 	"jqueryui": ">=1.9"
   },
-  "keywords": ["context menu", "contetxtmenu", "menu", "jquery ui menu", "popup", "right-click"]
+  "keywords": ["context-menu", "contetxtmenu", "menu", "jquery-ui-menu", "popup", "right-click"]
 }