diff --git a/.travis.yml b/.travis.yml
index 75f2fdc82..ed6910d54 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: node_js
 node_js:
   - "0.10"
+sudo: required
 before_install:
   - export WAPPALYZER_ROOT=$TRAVIS_BUILD_DIR
   - export WAPPALYZER_NODE_PATH=$TRAVIS_BUILD_DIR
diff --git a/src/apps.json b/src/apps.json
index 99dcbe311..b5694c3f4 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -2265,6 +2265,18 @@
 			},
 			"website": "www.grandstream.com"
 		},
+		"Grav": {
+			"cats": [
+				1
+			],
+			"implies": [
+				"PHP"
+			],
+			"meta": {
+				"generator": "Grav(?:\\s([\\d.]+))?\\;version:\\1"
+			},
+			"website": "getgrav.org"
+		},
 		"Gravatar": {
 			"cats": [
 				19
@@ -2375,18 +2387,6 @@
 			"script": "handlebars(?:\\.runtime)?(?:-v([\\d.]+?))?(?:\\.min)?\\.js\\;version:\\1",
 			"website": "handlebarsjs.com"
 		},
-		"hapi.js": {
-			"cats": [
-				18,
-				22
-			],
-			"headers": {
-				"Set-Cookie": "crumb=\\;confidence:50",
-				"Set-Cookie": "Fe26\\.2\\*\\*\\;confidence:50"
-			},
-			"implies": "node.js",
-			"website": "hapijs.com"
-		},
 		"Happy ICS Server": {
 			"cats": [
 				22
@@ -4132,15 +4132,15 @@
 			"website": "oracle.com"
 		},
 		"Orchard CMS": {
-+			"cats": [
-+				1
-+			],
-+			"implies": "Microsoft ASP.NET",
-+			"meta": {
-+				"generator": "Orchard"
-+			},
-+			"website": "orchardproject.net/"
-+		},
+			"cats": [
+				1
+			],
+			"implies": "Microsoft ASP.NET",
+			"meta": {
+				"generator": "Orchard"
+			},
+			"website": "orchardproject.net"
+		},
 		"Outbrain": {
 			"cats": [
 				5
@@ -4693,14 +4693,14 @@
 			"script": "right\\.js",
 			"website": "rightjs.org"
 		},
-        "Riot": {
-            "cats": [
-                12
-            ],
-            "env": "^riot$",
-            "script": "riot(?:\\+compiler)?(:?\\.min)?\\.js",
-            "website": "muut.com/riotjs"
-        },
+		"Riot": {
+			"cats": [
+				12
+			],
+			"env": "^riot$",
+			"script": "riot(?:\\+compiler)?(:?\\.min)?\\.js",
+			"website": "muut.com/riotjs"
+		},
 		"RiteCMS": {
 			"cats": [
 				1
@@ -5784,15 +5784,15 @@
 			"url": "/umbraco/login\\.aspx(?:$|\\?)",
 			"website": "umbraco.com"
 		},
-	    "Unbounce": {
+		"Unbounce": {
 			"cats": [
 				1,
-			  	20
+				20
 			],
 			"headers": {
-			  "X-Unbounce-PageId": ""
+				"X-Unbounce-PageId": ""
 			},
-		  	"website": "unbounce.com"
+			"website": "unbounce.com"
 		},
 		"Underscore.js": {
 			"cats": [
@@ -6730,6 +6730,17 @@
 			],
 			"website": "gunicorn.org"
 		},
+		"hapi.js": {
+			"cats": [
+				18,
+				22
+			],
+			"headers": {
+				"Set-Cookie": "Fe26\\.2\\*\\*\\;confidence:50"
+			},
+			"implies": "node.js",
+			"website": "hapijs.com"
+		},
 		"iCongo": {
 			"cats": [
 				6
diff --git a/src/icons/Grav.png b/src/icons/Grav.png
new file mode 100644
index 000000000..18ea09a58
Binary files /dev/null and b/src/icons/Grav.png differ