Merge branch 'master' into gh-pages

Author: shengyuan

bower.json

@@ -3,7 +3,7 @@
   "description": "GPS Module for Webduino",
   "main": "GPS.js",
   "authors": "",
-  "license": "ISC",
+  "license": "MIT",
   "keywords": [
     "arduino",
     "webduino",

package.json

@@ -1,19 +1,19 @@
 {
-  "name": "webduino-module-lcd1602",
+  "name": "webduino-module-gps",
   "version": "1.0.0",
-  "description": "LCD1602 Module for Webduino",
-  "main": "LCD1602.js",
+  "description": "GPS Module for Webduino",
+  "main": "GPS.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "",
-  "license": "ISC",
+  "license": "MIT",
   "keywords": [
     "arduino",
     "webduino",
-    "lcd1602"
+    "gps"
   ],
   "dependencies": {
     "webduino-js": "0.x"
   }
-}
+}