From cc6bd3c5f0d296aeec4f74b0178769f0b6e458ec Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Mon, 9 Jul 2012 22:59:40 +0200
Subject: [PATCH 001/174] Remove validation test for input type=color

---
 scripts/data.js   |  4 ----
 scripts/engine.js | 17 -----------------
 2 files changed, 21 deletions(-)

diff --git a/scripts/data.js b/scripts/data.js
index 0a6450d4..a77c2690 100644
--- a/scripts/data.js
+++ b/scripts/data.js
@@ -632,10 +632,6 @@ var tests = [
 										id:			'sanitization',
 										name: 		'Value sanitization', 
 										url:		'http://www.w3.org/TR/html5/the-input-element.html#value-sanitization-algorithm'
-									}, {
-										id:			'validation',
-										name: 		'Field validation', 
-										url:		'http://www.w3.org/TR/html5/association-of-controls-and-forms.html#dom-cva-validity'
 									}
 								]
 					}, {
diff --git a/scripts/engine.js b/scripts/engine.js
index 042199f6..6e47d908 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -1441,17 +1441,6 @@ Test = (function() {
 			element.field.value = "foobar";					
 			var sanitization = element.field.value != 'foobar';
 
-			var validation = false;
-			if ('validity' in element.field) {
-				validation = true;
-				
-				element.field.value = "foo";
-				validation &= !element.field.validity.valid
-
-				element.field.value = '#000000';
-				validation &= element.field.validity.valid
-			}
-			
 			group.setItem({
 				id:			'element',
 				passed:		element.field.type == 'color',
@@ -1470,12 +1459,6 @@ Test = (function() {
 				required:	true
 			});
 				
-			group.setItem({
-				id:			'validation',
-				passed:		validation,
-				required:	true
-			});
-
 			this.removeInput(element);
 			
 			

From 9965a6ed1680ac1d96c263f8b87d20d3854ece59 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Mon, 9 Jul 2012 23:00:03 +0200
Subject: [PATCH 002/174] Set style to inline-block for input type=image

---
 scripts/engine.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/engine.js b/scripts/engine.js
index 6e47d908..5dc015f2 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -1493,6 +1493,7 @@ Test = (function() {
 			});
 			
 			var element = this.createInput('image');
+			element.field.style.display = 'inline-block';
 			
 			var supportsWidth = 'width' in element.field;
 			var supportsHeight = 'height' in element.field;

From 87ee80e502be42f75e76cc4d1ba8dbe22d0ef045 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Mon, 9 Jul 2012 23:00:27 +0200
Subject: [PATCH 003/174] Set the number of points of getUserMedia to 10
 instead of 20

---
 scripts/engine.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/engine.js b/scripts/engine.js
index 5dc015f2..91235f6a 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -856,7 +856,7 @@ Test = (function() {
 			this.section.setItem({
 				id:		'getUserMedia',
 				passed:	!blacklists.getUserMedia && (!!navigator.getUserMedia || !!navigator.webkitGetUserMedia || !!navigator.mozGetUserMedia || !!navigator.msGetUserMedia || !!navigator.oGetUserMedia), 
-				value: 	20
+				value: 	10
 			});
 		}
 	}

From 200ca0227c1df7e71245d67a09010cc69cf7733b Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Mon, 9 Jul 2012 23:13:06 +0200
Subject: [PATCH 004/174] Update version number to 4.0

---
 about.html                     | 2 +-
 backend/templates/browser.html | 2 +-
 backend/templates/feature.html | 2 +-
 backend/templates/results.html | 2 +-
 index.html                     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/about.html b/about.html
index 1fd42b92..7ba4b4f4 100644
--- a/about.html
+++ b/about.html
@@ -256,7 +256,7 @@ <h3>What kind of data is collected from visitors?</h3>
 				
 				<div class='copyright'>
 					<p>Copyright 2010-2012 by Sights</p>
-					<p>April, 2012 - version 3.0</p>
+					<p>August, 2012 - version 4.0</p>
 					<p data-i18n='footer'>
 						The HTML5 test is being developed at <a href='http://github.com/NielsLeenheer/html5test'>Github</a>. Please file an issue there if you find any bugs or think of any improvements to this test.
 						Please note that the HTML5 test is not affiliated with the W3C or the HTML5 working group.
diff --git a/backend/templates/browser.html b/backend/templates/browser.html
index 4e0933f6..c83582b2 100644
--- a/backend/templates/browser.html
+++ b/backend/templates/browser.html
@@ -112,7 +112,7 @@ <h3 data-i18n>About these scores</h3>
 				
 				<div class='copyright'>
 					<p>Copyright 2010-2012 by Sights</p>
-					<p>April, 2012 - version 3.0</p>
+					<p>August, 2012 - version 4.0</p>
 					<p data-i18n='footer'>
 						The HTML5 test is being developed at <a href='http://github.com/NielsLeenheer/html5test'>Github</a>. Please file an issue there if you find any bugs or think of any improvements to this test.
 						Please note that the HTML5 test is not affiliated with the W3C or the HTML5 working group.
diff --git a/backend/templates/feature.html b/backend/templates/feature.html
index 1ad72b19..f2934319 100644
--- a/backend/templates/feature.html
+++ b/backend/templates/feature.html
@@ -103,7 +103,7 @@ <h3 data-i18n>About these scores</h3>
 				
 				<div class='copyright'>
 					<p>Copyright 2010-2012 by Sights</p>
-					<p>April, 2012 - version 3.0</p>
+					<p>August, 2012 - version 4.0</p>
 					<p data-i18n='footer'>
 						The HTML5 test is being developed at <a href='http://github.com/NielsLeenheer/html5test'>Github</a>. Please file an issue there if you find any bugs or think of any improvements to this test.
 						Please note that the HTML5 test is not affiliated with the W3C or the HTML5 working group.
diff --git a/backend/templates/results.html b/backend/templates/results.html
index 95ba5cb5..16ad995e 100644
--- a/backend/templates/results.html
+++ b/backend/templates/results.html
@@ -313,7 +313,7 @@ <h3 data-i18n>About these scores</h3>
 				
 				<div class='copyright'>
 					<p>Copyright 2010-2012 by Sights</p>
-					<p>April, 2012 - version 3.0</p>
+					<p>August, 2012 - version 4.0</p>
 					<p data-i18n='footer'>
 						The HTML5 test is being developed at <a href='http://github.com/NielsLeenheer/html5test'>Github</a>. Please file an issue there if you find any bugs or think of any improvements to this test.
 						Please note that the HTML5 test is not affiliated with the W3C or the HTML5 working group.
diff --git a/index.html b/index.html
index 2a443950..15bb8f17 100644
--- a/index.html
+++ b/index.html
@@ -177,7 +177,7 @@ <h2>
 				
 				<div class='copyright'>
 					<p>Copyright 2010-2012 by Sights</p>
-					<p>April, 2012 - version 3.0</p>
+					<p>August, 2012 - version 4.0</p>
 					<p data-i18n='footer'>
 						The HTML5 test is being developed at <a href='http://github.com/NielsLeenheer/html5test'>Github</a>. Please file an issue there if you find any bugs or think of any improvements to this test.
 						Please note that the HTML5 test is not affiliated with the W3C or the HTML5 working group.

From f496f473269d30816cece3c2a0f475020a4cba42 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Tue, 10 Jul 2012 09:52:30 +0200
Subject: [PATCH 005/174] Add new tests for valueAsDate and valueAsNumber

---
 scripts/data.js   | 52 +++++++++++++++++++++++++++++++++++++++++++++++
 scripts/engine.js | 20 ++++++++++++++++++
 2 files changed, 72 insertions(+)

diff --git a/scripts/data.js b/scripts/data.js
index a77c2690..34a45d7c 100644
--- a/scripts/data.js
+++ b/scripts/data.js
@@ -352,6 +352,14 @@ var tests = [
 										id:			'stepUp',
 										name: 		'<code>stepUp()</code> method',
 										url:		'http://www.w3.org/TR/html5/common-input-element-attributes.html#dom-input-stepup'
+									}, {
+										id:			'valueAsDate',
+										name: 		'<code>valueAsDate()</code> method',
+										url:		'http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-valueasdate'
+									}, {
+										id:			'valueAsNumber',
+										name: 		'<code>valueAsNumber()</code> method',
+										url:		'http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-valueasnumber'
 									}
 								]
 					}, {
@@ -389,6 +397,14 @@ var tests = [
 										id:			'stepUp',
 										name: 		'<code>stepUp()</code> method',
 										url:		'http://www.w3.org/TR/html5/common-input-element-attributes.html#dom-input-stepup'
+									}, {
+										id:			'valueAsDate',
+										name: 		'<code>valueAsDate()</code> method',
+										url:		'http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-valueasdate'
+									}, {
+										id:			'valueAsNumber',
+										name: 		'<code>valueAsNumber()</code> method',
+										url:		'http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-valueasnumber'
 									}
 								]
 					}, {
@@ -426,6 +442,14 @@ var tests = [
 										id:			'stepUp',
 										name: 		'<code>stepUp()</code> method',
 										url:		'http://www.w3.org/TR/html5/common-input-element-attributes.html#dom-input-stepup'
+									}, {
+										id:			'valueAsDate',
+										name: 		'<code>valueAsDate()</code> method',
+										url:		'http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-valueasdate'
+									}, {
+										id:			'valueAsNumber',
+										name: 		'<code>valueAsNumber()</code> method',
+										url:		'http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-valueasnumber'
 									}
 								]
 					}, {
@@ -463,6 +487,14 @@ var tests = [
 										id:			'stepUp',
 										name: 		'<code>stepUp()</code> method',
 										url:		'http://www.w3.org/TR/html5/common-input-element-attributes.html#dom-input-stepup'
+									}, {
+										id:			'valueAsDate',
+										name: 		'<code>valueAsDate()</code> method',
+										url:		'http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-valueasdate'
+									}, {
+										id:			'valueAsNumber',
+										name: 		'<code>valueAsNumber()</code> method',
+										url:		'http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-valueasnumber'
 									}
 								]
 					}, {
@@ -500,6 +532,14 @@ var tests = [
 										id:			'stepUp',
 										name: 		'<code>stepUp()</code> method',
 										url:		'http://www.w3.org/TR/html5/common-input-element-attributes.html#dom-input-stepup'
+									}, {
+										id:			'valueAsDate',
+										name: 		'<code>valueAsDate()</code> method',
+										url:		'http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-valueasdate'
+									}, {
+										id:			'valueAsNumber',
+										name: 		'<code>valueAsNumber()</code> method',
+										url:		'http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-valueasnumber'
 									}
 								]
 					}, {
@@ -537,6 +577,10 @@ var tests = [
 										id:			'stepUp',
 										name: 		'<code>stepUp()</code> method',
 										url:		'http://www.w3.org/TR/html5/common-input-element-attributes.html#dom-input-stepup'
+									}, {
+										id:			'valueAsNumber',
+										name: 		'<code>valueAsNumber()</code> method',
+										url:		'http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-valueasnumber'
 									}
 								]
 					}, {
@@ -578,6 +622,10 @@ var tests = [
 										id:			'stepUp',
 										name: 		'<code>stepUp()</code> method',
 										url:		'http://www.w3.org/TR/html5/common-input-element-attributes.html#dom-input-stepup'
+									}, {
+										id:			'valueAsNumber',
+										name: 		'<code>valueAsNumber()</code> method',
+										url:		'http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-valueasnumber'
 									}
 								]
 					}, {
@@ -615,6 +663,10 @@ var tests = [
 										id:			'stepUp',
 										name: 		'<code>stepUp()</code> method',
 										url:		'http://www.w3.org/TR/html5/common-input-element-attributes.html#dom-input-stepup'
+									}, {
+										id:			'valueAsNumber',
+										name: 		'<code>valueAsNumber()</code> method',
+										url:		'http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-valueasnumber'
 									}
 								]
 					}, {
diff --git a/scripts/engine.js b/scripts/engine.js
index 91235f6a..b61b2854 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -1329,6 +1329,20 @@ Test = (function() {
 					required:	true
 				});
 				
+				if (t != 'datetime-local') {
+					group.setItem({
+						id:			'valueAsDate',
+						passed:		minimal && 'valueAsDate' in element.field,
+						required:	true
+					});
+				}
+				
+				group.setItem({
+					id:			'valueAsNumber',
+					passed:		minimal && 'valueAsNumber' in element.field,
+					required:	true
+				});
+
 				this.removeInput(element);
 			}
 			
@@ -1426,6 +1440,12 @@ Test = (function() {
 					required:	true
 				});
 				
+				group.setItem({
+					id:			'valueAsNumber',
+					passed:		minimal && 'valueAsNumber' in element.field,
+					required:	true
+				});
+
 				this.removeInput(element);
 			}					
 			

From 1f7183f129dbe1cc72dc1d47341b1ea4b2f31c5d Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Tue, 10 Jul 2012 09:53:05 +0200
Subject: [PATCH 006/174] Change mark to test to detect background color other
 than transparent, instead of specific colors

---
 scripts/engine.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/engine.js b/scripts/engine.js
index b61b2854..0dc27ab8 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -933,7 +933,7 @@ Test = (function() {
 
 			group.setItem({
 				id:		'mark',
-				passed:	typeof HTMLElement != 'undefined' && element instanceof HTMLElement && (color = this.getStyle(element, 'background-color')) && (color == 'yellow' || color == 'rgb(255, 255, 0)' || color == '#ffff00'), 
+				passed:	typeof HTMLElement != 'undefined' && element instanceof HTMLElement && (color = this.getStyle(element, 'background-color')) && (color != 'transparent'), 
 				value: 	1
 			});
 

From 575c5f391307b9e17a97ddd1c2942fbabbed6a79 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 23 Sep 2012 20:36:29 +0200
Subject: [PATCH 007/174] The HTML5 logo was not displayed correctly on devices
 with a device pixel ratio higher than 2

---
 css/main.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/css/main.css b/css/main.css
index 11939966..a809e300 100644
--- a/css/main.css
+++ b/css/main.css
@@ -131,7 +131,7 @@ body {
 
 @media only screen and (-webkit-min-device-pixel-ratio: 2) {
 	#html5 {
-		background: url(/images/html5@2x.png);
+		background-image: url(/images/html5@2x.png);
 	}
 }
 

From 38be656468933847064809c38a1d3fcfb7feb65a Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 23 Sep 2012 20:37:23 +0200
Subject: [PATCH 008/174] Add support for Ogg Opus

---
 scripts/data.js   | 3 +++
 scripts/engine.js | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/scripts/data.js b/scripts/data.js
index 34a45d7c..784bc8f7 100644
--- a/scripts/data.js
+++ b/scripts/data.js
@@ -105,6 +105,9 @@ var tests = [
 					}, { 
 						id:		'vorbis',
 						name: 	'Ogg Vorbis support'
+					}, {
+						id:		'opus',
+						name: 	'Ogg Opus support'
 					}, { 
 						id:		'webm',
 						name: 	'WebM support'
diff --git a/scripts/engine.js b/scripts/engine.js
index 0dc27ab8..46a5417f 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -823,6 +823,14 @@ Test = (function() {
 			if (item.passed) item.bonus = 1;
 			this.section.setItem(item);
 
+			var item = {
+				id:		'opus',
+				passed:	!!this.element.canPlayType && this.canPlayType('audio/ogg; codecs="opus"') 
+			};
+			
+			if (item.passed) item.bonus = 1;
+			this.section.setItem(item);
+
 			var item = {
 				id:		'webm',
 				passed:	!!this.element.canPlayType && this.canPlayType('audio/webm; codecs="vorbis"') 

From 7bed9b402cca4faaf965bf1a6547a8b1a39cab99 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 23 Sep 2012 20:38:19 +0200
Subject: [PATCH 009/174] Add support for the download and ping attribute on
 the a element

---
 scripts/data.js   |  8 ++++++++
 scripts/engine.js | 14 ++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/scripts/data.js b/scripts/data.js
index 784bc8f7..34e43cdf 100644
--- a/scripts/data.js
+++ b/scripts/data.js
@@ -183,6 +183,14 @@ var tests = [
 						name:	'Text-level semantic elements',
 						items:	[
 									{
+										id:		'download',
+										name: 	'<code>download</code> attribute on the <code>a</code> element', 
+										url:	'http://developers.whatwg.org/links.html#attr-hyperlink-download'
+									}, {
+										id:		'ping',
+										name: 	'<code>ping</code> attribute on the <code>a</code> element', 
+										url:	'http://developers.whatwg.org/links.html#ping'
+									}, {
 										id:		'mark',
 										name: 	'<code>mark</code> element', 
 										url:	'http://www.w3.org/TR/html5/text-level-semantics.html#the-mark-element'
diff --git a/scripts/engine.js b/scripts/engine.js
index 46a5417f..de1212f7 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -936,6 +936,20 @@ Test = (function() {
 				id:		'semantic'
 			});
 			
+			var element = document.createElement('a');
+			group.setItem({
+				id:		'download',
+				passed:	'download' in element, 
+				value: 	1
+			});
+			
+			group.setItem({
+				id:		'ping',
+				passed:	'ping' in element, 
+				value: 	1
+			});
+
+
 			var element = document.createElement('mark');
 			document.body.appendChild(element);
 

From 7e39d5e27d9fa4ac33654abfd9c2d9889d334be1 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 23 Sep 2012 20:38:45 +0200
Subject: [PATCH 010/174] Add showModalDialog

---
 scripts/data.js   | 8 ++++++++
 scripts/engine.js | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/scripts/data.js b/scripts/data.js
index 34e43cdf..e4d0b7fd 100644
--- a/scripts/data.js
+++ b/scripts/data.js
@@ -1133,6 +1133,14 @@ var tests = [
 						id:			'spellcheck',
 						name: 		'<code>spellcheck</code> attribute', 
 						url:		'http://www.w3.org/TR/html5/editing.html#attr-spellcheck'
+					},
+
+					'<strong>Dialogs</strong>',
+					
+					{
+						id:			'modaldialog',
+						name: 		'<code>showModalDialog</code> method', 
+						url:		'http://www.whatwg.org/specs/web-apps/current-work/multipage/timers.html#dom-showmodaldialog'
 					}
 				]
 	}, {
diff --git a/scripts/engine.js b/scripts/engine.js
index de1212f7..78c22fc7 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -2226,6 +2226,12 @@ Test = (function() {
 				passed:		!!('spellcheck' in element), 
 				value: 		1
 			});
+
+			this.section.setItem({
+				id:			'modaldialog',
+				passed:		'showModalDialog' in window, 
+				value: 		2
+			});
 		}			
 	};
 

From 2750c9787cc9e769f2f58905c349f5cbd8b7afb2 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 23 Sep 2012 20:39:10 +0200
Subject: [PATCH 011/174] Support for Mutation Observer

---
 scripts/data.js   | 3 +++
 scripts/engine.js | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/scripts/data.js b/scripts/data.js
index e4d0b7fd..344564f3 100644
--- a/scripts/data.js
+++ b/scripts/data.js
@@ -1432,6 +1432,9 @@ var tests = [
 					}, {
 						id:			'scrollIntoView',
 						name: 		'Scroll into view'
+					}, {
+						id: 		'mutationObserver',
+						name:   	'Mutation Observer'
 					}
 				]
 	},
diff --git a/scripts/engine.js b/scripts/engine.js
index 78c22fc7..f2bc95ee 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -2845,6 +2845,12 @@ Test = (function() {
 				passed:		!!element.scrollIntoView, 
 				value: 		1
 			});
+			
+			this.section.setItem({
+				id:   		'mutationObserver',
+				passed:   	'MutationObserver' in window || 'webkitMutationObserver' in window || 'mozMutationObserver' in window || 'oMutationObserver' in window || 'msMutationObserver' in window,
+				value:  	3 
+			});
 		}
 	};			
 	

From a1ce7d19901192499099944595fcc5fdf02a2a9c Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 23 Sep 2012 20:39:46 +0200
Subject: [PATCH 012/174] Add support for PointerLock

---
 scripts/data.js   | 4 ++++
 scripts/engine.js | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/scripts/data.js b/scripts/data.js
index 344564f3..b2a7c1e4 100644
--- a/scripts/data.js
+++ b/scripts/data.js
@@ -1459,6 +1459,10 @@ var tests = [
 						id:			'requestFullScreen',
 						name: 		'Full screen support', 
 						url:		'http://dvcs.w3.org/hg/fullscreen/raw-file/tip/Overview.html#api'
+					}, {
+						id:			'pointerLock',
+						name: 		'Pointer Lock support', 
+						url:		'http://dvcs.w3.org/hg/pointerlock/raw-file/default/index.html'
 					}, {
 						id:			'requestAnimationFrame',
 						name: 		'<code>window.requestAnimationFrame</code>', 
diff --git a/scripts/engine.js b/scripts/engine.js
index f2bc95ee..799fbbe0 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -2885,6 +2885,12 @@ Test = (function() {
 				passed:		!! document.documentElement.requestFullScreen || !! document.documentElement.webkitRequestFullScreen || !! document.documentElement.mozRequestFullScreen || !! document.documentElement.msRequestFullScreen || !! document.documentElement.oRequestFullScreen, 
 				value: 		2
 			});
+			
+			this.section.setItem({
+				id:   		'pointerLock',
+				passed:  	'pointerLockElement' in document || 'oPointerLockElement' in document || 'msPointerLockElement' in document || 'mozPointerLockElement' in document || 'webkitPointerLockElement' in document,
+				value:   	3
+			});
 
 			this.section.setItem({
 				id:			'requestAnimationFrame',

From 9709cd1db7e155df8332e9eb0372f582d8cef723 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 23 Sep 2012 20:41:02 +0200
Subject: [PATCH 013/174] Add a nota about File API: directories and system
 being proprietary and set the number of points to 0

---
 scripts/data.js   | 10 +++++++---
 scripts/engine.js |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/scripts/data.js b/scripts/data.js
index b2a7c1e4..a2f2f1e4 100644
--- a/scripts/data.js
+++ b/scripts/data.js
@@ -1349,11 +1349,15 @@ var tests = [
 		items:	[
 					{
 						id:			'fileReader',
-						name: 		'FileReader API', 
+						name: 		'File API', 
 						url:    	'http://dev.w3.org/2006/webapi/FileAPI/#filereader-interface'
-					}, {
+					}, 
+					
+					'<em>The Directories and System API proposal has failed to gain traction among browser vendors and is only supported in some Webkit based browsers. No additional points are awarded for supporting this API.</em>',
+
+					{
 						id:			'fileSystem',
-						name: 		'FileSystem API', 
+						name: 		'File API: Directories and System', 
 						url:    	'http://www.w3.org/TR/file-system-api/'
 					}
 				]
diff --git a/scripts/engine.js b/scripts/engine.js
index 799fbbe0..1445023a 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -2722,7 +2722,7 @@ Test = (function() {
 			this.section.setItem({
 				id:			'fileSystem',
 				passed:		!! window.requestFileSystem || !! window.webkitRequestFileSystem || !! window.mozRequestFileSystem || !! window.oRequestFileSystem || !! window.msRequestFileSystem, 
-				value: 		10
+				value: 		0
 			});
 		}
 	};

From 14d084a4c8696e71f9e35971fe98d5a0517eb0f1 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 23 Sep 2012 20:41:36 +0200
Subject: [PATCH 014/174] Add iOS < 6 on the blacklist for file input fields

---
 scripts/engine.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/engine.js b/scripts/engine.js
index 1445023a..ee79bad4 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -13,6 +13,7 @@ Test = (function() {
 		
 		initialize: function(c) {					
 			blacklists = {
+				fileField: 			Browsers.isOs('iOS', '<', '6'), 
 				dateFields:			Browsers.isBrowser('Maxthon') || Browsers.isBrowser('UC Browser'),
 				colorField:			Browsers.isBrowser('Maxthon') || Browsers.isBrowser('UC Browser'),
 				rangeField:			Browsers.isBrowser('UC Browser'),
@@ -1574,13 +1575,13 @@ Test = (function() {
 			
 			group.setItem({
 				id:			'element',
-				passed:		element.field.type == 'file',
+				passed:		!blacklists.fileInput && element.field.type == 'file',
 				value: 		0
 			});
 
 			group.setItem({
 				id:			'files',
-				passed:		element.field.files && element.field.files instanceof FileList,
+				passed:		!blacklists.fileInput && element.field.files && element.field.files instanceof FileList,
 				value: 		1
 			});
 

From f406771a84f46000a4836b79407d6fe81f9e7d3f Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 23 Sep 2012 20:42:42 +0200
Subject: [PATCH 015/174] Set the number of points for drag and drop to 0, to
 make sure mobile and television browsers can score the full 500 points

---
 scripts/engine.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/engine.js b/scripts/engine.js
index ee79bad4..e70a6bf8 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -2091,13 +2091,13 @@ Test = (function() {
 			group.setItem({
 				id:			'draggable',
 				passed:		'draggable' in element && whitelists.dragdrop,
-				value:		10
+				value:		0
 			});
 
 			group.setItem({
 				id:			'dropzone',
 				passed:		('dropzone' in element || 'webkitdropzone' in element || 'mozdropzone' in element || 'msdropzone' in element || 'odropzone' in element) && whitelists.dragdrop,
-				value:		2
+				value:		0
 			});
 			
 			var group = this.section.getGroup({
@@ -2112,43 +2112,43 @@ Test = (function() {
 			group.setItem({
 				id:			'ondrag',
 				passed:		isEventSupported('drag') && supported, 
-				value: 		1
+				value: 		0
 			});
 			
 			group.setItem({
 				id:			'ondragstart',
 				passed:		isEventSupported('dragstart') && supported, 
-				value: 		1
+				value: 		0
 			});
 			
 			group.setItem({
 				id:			'ondragenter',
 				passed:		isEventSupported('dragenter') && supported, 
-				value: 		1
+				value: 		0
 			});
 			
 			group.setItem({
 				id:			'ondragover',
 				passed:		isEventSupported('dragover') && supported, 
-				value: 		1
+				value: 		0
 			});
 			
 			group.setItem({
 				id:			'ondragleave',
 				passed:		isEventSupported('dragleave') && supported, 
-				value: 		1
+				value: 		0
 			});
 			
 			group.setItem({
 				id:			'ondragend',
 				passed:		isEventSupported('dragend') && supported, 
-				value: 		1
+				value: 		0
 			});
 			
 			group.setItem({
 				id:			'ondrop',
 				passed:		isEventSupported('drop') && supported, 
-				value: 		1
+				value: 		0
 			});
 
 			

From 5d2acbd07b864c874534f0723d2b9b6835af3c70 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 23 Sep 2012 20:43:33 +0200
Subject: [PATCH 016/174] Fix a typo in the requestFullscreen test

---
 scripts/engine.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/engine.js b/scripts/engine.js
index e70a6bf8..510f8bd4 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -2883,8 +2883,8 @@ Test = (function() {
 			
 			this.section.setItem({
 				id:			'requestFullScreen',
-				passed:		!! document.documentElement.requestFullScreen || !! document.documentElement.webkitRequestFullScreen || !! document.documentElement.mozRequestFullScreen || !! document.documentElement.msRequestFullScreen || !! document.documentElement.oRequestFullScreen, 
 				value: 		2
+				passed:		!! document.documentElement.requestFullscreen || !! document.documentElement.webkitRequestFullScreen || !! document.documentElement.mozRequestFullScreen || !! document.documentElement.msRequestFullScreen, 
 			});
 			
 			this.section.setItem({

From 48d52b394995e584e994bd1ac8bdd49ec52fd873 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 23 Sep 2012 20:44:12 +0200
Subject: [PATCH 017/174] Redistribute some of the points to emphasise the more
 important tests

---
 scripts/engine.js | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/scripts/engine.js b/scripts/engine.js
index 510f8bd4..064922ce 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -503,7 +503,7 @@ Test = (function() {
 			this.section.setItem({
 				id:		'doctype',
 				passed:	document.compatMode == 'CSS1Compat', 
-				value: 	1
+				value: 	0
 			});
 
 			var result = true;
@@ -707,7 +707,7 @@ Test = (function() {
 			this.section.setItem({
 				id:		'subtitle',
 				passed:	!blacklists.subtitle && 'track' in document.createElement('track'), 
-				value: 	10
+				value: 	9
 			});
 			
 			this.section.setItem({
@@ -884,7 +884,7 @@ Test = (function() {
 			this.section.setItem({
 				id:		'dataset',
 				passed:	'dataset' in element, 
-				value: 	4
+				value: 	7
 			});
 
 			var group = this.section.getGroup({
@@ -1306,7 +1306,7 @@ Test = (function() {
 				group.setItem({
 					id:			'element',
 					passed:		minimal,
-					value: 		2,
+					value: 		3,
 					required:	true
 				});
 				
@@ -1561,7 +1561,7 @@ Test = (function() {
 				passed:		supportsHeight && element.field.offsetHeight == 100,
 				value: 		1
 			});
-
+			
 			this.removeInput(element);
 			
 
@@ -2044,7 +2044,7 @@ Test = (function() {
 			group.setItem({
 				id:			'noValidate',
 				passed:		'noValidate' in element, 
-				value: 		1
+				value: 		2
 			});
 		}, 				
 			
@@ -2246,7 +2246,7 @@ Test = (function() {
 			this.section.setItem({
 				id:			'history',
 				passed:		!!(window.history && history.pushState), 
-				value: 		5
+				value: 		10
 			});
 		}			
 	};
@@ -2331,7 +2331,7 @@ Test = (function() {
 			this.section.setItem({
 				id:			'sandbox',
 				passed:		'sandbox' in document.createElement('iframe'), 
-				value: 		5
+				value: 		10
 			});
 
 			this.section.setItem({
@@ -2358,13 +2358,13 @@ Test = (function() {
 			this.section.setItem({
 				id:			'scoped',
 				passed:		'scoped' in document.createElement('style'), 
-				value: 		2
+				value: 		5
 			});
 
 			this.section.setItem({
 				id:			'async',
 				passed:		'async' in document.createElement('script'), 
-				value: 		2
+				value: 		3
 			});
 
 			this.section.setItem({
@@ -2510,7 +2510,7 @@ Test = (function() {
 			this.section.setItem({
 				id:			'eventSource',
 				passed:		'EventSource' in window, 
-				value: 		10
+				value: 		8
 			});
 			
 			var group = this.section.getGroup({
@@ -2760,7 +2760,7 @@ Test = (function() {
 			this.section.setItem({
 				id:			'indexedDB',
 				passed:		this.hasIndexedDB(), 
-				value: 		10
+				value: 		15
 			});
 
 			this.section.setItem({
@@ -2865,7 +2865,7 @@ Test = (function() {
 			this.section.setItem({
 				id:			'webaudio',
 				passed:		this.hasWebAudio(), 
-				value: 		4
+				value: 		5
 			});
 		},
 		
@@ -2883,8 +2883,8 @@ Test = (function() {
 			
 			this.section.setItem({
 				id:			'requestFullScreen',
-				value: 		2
 				passed:		!! document.documentElement.requestFullscreen || !! document.documentElement.webkitRequestFullScreen || !! document.documentElement.mozRequestFullScreen || !! document.documentElement.msRequestFullScreen, 
+				value: 		4
 			});
 			
 			this.section.setItem({
@@ -2896,7 +2896,7 @@ Test = (function() {
 			this.section.setItem({
 				id:			'requestAnimationFrame',
 				passed:		!! window.requestAnimationFrame || !! window.webkitRequestAnimationFrame || !! window.mozRequestAnimationFrame || !! window.msRequestAnimationFrame || !! window.oRequestAnimationFrame, 
-				value: 		2
+				value: 		3
 			});
 		}
 	};

From 6df397e615b6057a0f565ab489c3834132686180 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 23 Sep 2012 20:44:42 +0200
Subject: [PATCH 018/174] Add support for detection of BlackBerry 10 devices

---
 scripts/useragents.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 47793e89..d5949e33 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -2982,6 +2982,16 @@ var UserAgents = (function(){
 				this.device.type = 'mobile';
 				this.device.identified = true;
 			}
+			
+			if (match = /\(BB(1[^;]+); ([^\)]+)\)/.exec(ua)) {
+				this.os.name = 'BlackBerry';
+				this.os.version = new Version({ value: match[1], details: 2 });
+
+				this.device.manufacturer = 'RIM';
+				this.device.model = 'BlackBerry ' + match[2];
+				this.device.type = ua.match('Mobile') ? 'mobile' : 'tablet';
+				this.device.identified = true;
+			}
 				
 			/****************************************************
 			 *		BlackBerry PlayBook

From f2358b4574b35816b51ee5a1cde71d7f53908a92 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 23 Sep 2012 20:45:04 +0200
Subject: [PATCH 019/174] Add support for Chrome 21

---
 scripts/useragents.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index d5949e33..ae92bc71 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -4332,6 +4332,7 @@ var UserAgents = (function(){
 						case '18.0.1025':
 						case '19.0.1084':
 						case '20.0.1132':
+						case '21.0.1180':
 							if (this.browser.version.minor == 0) 
 								this.browser.version.details = 1;
 							else

From e40cfe434805709ae7b23a97f30c73744b965c87 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 23 Sep 2012 20:45:21 +0200
Subject: [PATCH 020/174] Add various new devices and models

---
 scripts/useragents.js | 141 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 116 insertions(+), 25 deletions(-)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index ae92bc71..8c6d2507 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -209,10 +209,9 @@ var UserAgents = (function(){
 			'GT-I8350T':							[ STRINGS_SAMSUNG, 'Omnia W' ],
 			'SGH-i677':								[ STRINGS_SAMSUNG, 'Focus Flash' ],
 			'SGH-i707':								[ STRINGS_SAMSUNG, 'Taylor' ],
-			'SGH-i917':								[ STRINGS_SAMSUNG, 'Omnia 7' ],
-			'SGH-I917':								[ STRINGS_SAMSUNG, 'Omnia 7' ],
-			'SGH-i917.':							[ STRINGS_SAMSUNG, 'Focus' ],
+			'SGH-i917':								[ STRINGS_SAMSUNG, 'Focus' ],
 			'SGH-i917R':							[ STRINGS_SAMSUNG, 'Focus' ],
+			'SGH-I917':								[ STRINGS_SAMSUNG, 'Focus' ],
 			'SGH-i937':								[ STRINGS_SAMSUNG, 'Focus S' ],
 			'OMNIA7':								[ STRINGS_SAMSUNG, 'Omnia 7' ],
 			'OMINA7':								[ STRINGS_SAMSUNG, 'Omnia 7' ],
@@ -371,6 +370,7 @@ var UserAgents = (function(){
 		'one touch 890':							[ STRINGS_ALCATEL, 'One Touch 890' ],
 		'one touch 890D':							[ STRINGS_ALCATEL, 'One Touch 890' ],
 		'one touch 891':							[ STRINGS_ALCATEL, 'One Touch 891' ],
+		'ONE TOUCH 903':							[ STRINGS_ALCATEL, 'One Touch 903SHV-E170K' ],
 		'one touch 906':							[ STRINGS_ALCATEL, 'One Touch 906' ],
 		'one touch 908':							[ STRINGS_ALCATEL, 'One Touch 908' ],
 		'one touch 908F':							[ STRINGS_ALCATEL, 'One Touch 908' ],
@@ -380,6 +380,7 @@ var UserAgents = (function(){
 		'one touch 918D':							[ STRINGS_ALCATEL, 'One Touch 918' ],
 		'ONE TOUCH 918D':							[ STRINGS_ALCATEL, 'One Touch 918' ],
 		'one touch 918M':							[ STRINGS_ALCATEL, 'One Touch 918' ],
+		'one touch 918N':							[ STRINGS_ALCATEL, 'One Touch 918' ],
 		'one touch 980':							[ STRINGS_ALCATEL, 'One Touch 980' ],
 		'one touch 980A':							[ STRINGS_ALCATEL, 'One Touch 980' ],
 		'one touch 981A':							[ STRINGS_ALCATEL, 'One Touch 981' ],
@@ -388,6 +389,7 @@ var UserAgents = (function(){
 		'one touch 990A':							[ STRINGS_ALCATEL, 'One Touch 990' ],
 		'one touch 991':							[ STRINGS_ALCATEL, 'One Touch 991' ],
 		'one touch 991D':							[ STRINGS_ALCATEL, 'One Touch 991' ],
+		'ONE TOUCH 993':							[ STRINGS_ALCATEL, 'One Touch 993' ],
 		'one touch 995':							[ STRINGS_ALCATEL, 'One Touch 995' ],
 		'Telenor OneTouch':							[ STRINGS_ALCATEL, 'One Touch 990' ],
 		'OT 918':									[ STRINGS_ALCATEL, 'One Touch 918' ],
@@ -444,6 +446,7 @@ var UserAgents = (function(){
 		'OMS TTD':									[ STRINGS_ASUS, 'Eee Pc T10' ],
 		'ASUS T20':									[ STRINGS_ASUS, 'Eee Pc T20' ],
 		'ETBW11AA':									[ STRINGS_ASUS, 'Tough' ],
+		'AUX V900':									[ 'AUX', 'V900' ],
 		'PICOpad-QGN':								[ 'Axioo', 'Picopad QGN', 'tablet' ],
 		'NOOK':										[ STRINGS_BN, 'NOOK', 'ereader' ],
 		'NookColor':								[ STRINGS_BN, 'NOOK Color', 'ereader' ],
@@ -456,6 +459,7 @@ var UserAgents = (function(){
 		'BNTV250':									[ STRINGS_BN, 'NOOK Tablet', 'ereader' ],
 		'BNTV250A':									[ STRINGS_BN, 'NOOK Tablet', 'ereader' ],
 		'NOOK Slate':								[ STRINGS_BN, 'NOOK Tablet', 'ereader' ],
+		'BenWee 5100':								[ 'BenWee', '5100' ],
 		'CA907AAC0G':								[ 'Besta', 'CA907AAC0G' ],
 		'BM999':									[ 'Bmorn', 'BM999', 'tablet' ],
 		'V11':										[ 'Bmorn', 'V11', 'tablet' ],
@@ -505,10 +509,13 @@ var UserAgents = (function(){
 		'Coolpad W706+':							[ STRINGS_COOLPAD, 'W706' ],
 		'Coolpad W708':								[ STRINGS_COOLPAD, 'W708' ],
 		'W711':										[ STRINGS_COOLPAD, 'W711' ],
+		'Coolpad 5210':								[ STRINGS_COOLPAD, '5210' ],
 		'Coolpad 5820':								[ STRINGS_COOLPAD, '5820' ],
+		'5832':										[ STRINGS_COOLPAD, '5832' ],
 		'Coolpad 5832':								[ STRINGS_COOLPAD, '5832' ],
 		'5855':										[ STRINGS_COOLPAD, '5855' ],
 		'Coolpad 5860':								[ STRINGS_COOLPAD, '5860' ],
+		'Coolpad 5860+':							[ STRINGS_COOLPAD, '5860' ],
 		'5860':										[ STRINGS_COOLPAD, '5860' ],
 		'Coolpad 5870':								[ STRINGS_COOLPAD, '5870' ],
 		'Coolpad 7005':								[ STRINGS_COOLPAD, '7005' ],
@@ -541,6 +548,7 @@ var UserAgents = (function(){
 		'U9GTS A':									[ 'Cube', 'U9GT SA', 'tablet' ],
 		'U10GT 2':									[ 'Cube', 'U10GT 2', 'tablet' ],
 		'U10GT S':									[ 'Cube', 'U10GT S', 'tablet' ],
+		'U30GT-H':									[ 'Cube', 'U30GT H', 'tablet' ],
 		'CUBE Q7PRO':								[ 'Cube', 'Q7 Pro', 'tablet' ],
 		'CUBE Q7PRO J':								[ 'Cube', 'Q7 Pro', 'tablet' ],
 		'Cydle M7 (v0005.04.03.12.ko)':				[ 'Cydle', 'M7 MultiPAD', 'tablet' ],
@@ -580,6 +588,7 @@ var UserAgents = (function(){
 		'F-03D':									[ 'Fujitsu', 'Arrows Kiss' ],
 		'F-05D':									[ 'Fujitsu', 'Arrows X LTE' ],
 		'F-07D':									[ 'Fujitsu', 'Arrows μ' ],
+		'F-10D':									[ 'Fujitsu', 'Arrows X F-10D' ],
 		'F-12C':									[ 'Fujitsu', 'Globetrotter' ],
 		'f12arc':									[ 'Fujitsu', 'F12arc' ],
 		'M532':										[ 'Fujitsu', 'Stylistic M532', 'tablet' ],
@@ -606,6 +615,7 @@ var UserAgents = (function(){
 		'Nexus S 4G':								[ 'Google', 'Nexus S 4G' ],
 		'Dooderbutt-4.0.3-v1':						[ 'Google', 'Nexus S 4G' ],
 		'Nexus 7':									[ 'Google', 'Nexus 7', 'tablet' ],
+		'Haier HW-W910':							[ 'Haier', 'HW-W910' ],
 		'SN10T1':									[ 'HANNspree', 'HANNSpad SN10T1', 'tablet' ],
 		'SN10T2':									[ 'HANNspree', 'HANNSpad SN10T2', 'tablet' ],
 		'HannsComb':								[ 'HANNspree', 'HANNSpad', 'tablet' ],
@@ -621,6 +631,7 @@ var UserAgents = (function(){
 		'HS-ET919':									[ 'Hisense', 'ET919' ],
 		'EG968B':									[ 'Hisense', 'EG968B' ],
 		'HKPHONE H8-3G':							[ 'HKPhone', 'H8 3G' ],
+		'HOSIN U2':									[ 'Hosin', 'U2' ],
 		'Touchpad':									[ 'HP', 'TouchPad', 'tablet' ],
 		'HP Touchpad':								[ 'HP', 'TouchPad', 'tablet' ],
 		'cm tenderloin':							[ 'HP', 'TouchPad', 'tablet' ],
@@ -648,11 +659,13 @@ var UserAgents = (function(){
 		'HTC Desire CDMA':							[ STRINGS_HTC, 'Desire' ],
 		'HTC Desire SMS':							[ STRINGS_HTC, 'Desire' ],
 		'HTC Desire S.M.S':							[ STRINGS_HTC, 'Desire' ],
+		'HTC Desire C':								[ STRINGS_HTC, 'Desire C' ],
 		'HTC DesireHD':								[ STRINGS_HTC, 'Desire HD' ],
 		'HTC DesireHD A9191':						[ STRINGS_HTC, 'Desire HD' ],
 		'HTC DesireHD A9192':						[ STRINGS_HTC, 'Desire HD' ],
 		'HTC Desire HD A9191':						[ STRINGS_HTC, 'Desire HD' ],
 		'HTC A9191':								[ STRINGS_HTC, 'Desire HD' ],
+		'HTC A9191 for AT&T':						[ STRINGS_HTC, 'Desire HD' ],
 		'HTC A9192':								[ STRINGS_HTC, 'Desire HD' ],
 		'HTC Desire HD':							[ STRINGS_HTC, 'Desire HD' ],
 		'HTC Desire HD with Beats Audio':			[ STRINGS_HTC, 'Desire HD' ],
@@ -666,7 +679,9 @@ var UserAgents = (function(){
 		'HTC Desire Saga':							[ STRINGS_HTC, 'Desire S' ],
 		'HTC Desire V':								[ STRINGS_HTC, 'Desire V' ],
 		'HTC T328w':								[ STRINGS_HTC, 'Desire V' ],
-		'HTC T328t':								[ STRINGS_HTC, 'Desire VT' ],	
+		'HTC Desire VC':							[ STRINGS_HTC, 'Desire VC' ],
+		'HTC T328d':								[ STRINGS_HTC, 'Desire VC' ],
+		'HTC T328t':								[ STRINGS_HTC, 'Desire VT' ],
 		'HTC Desire Z':								[ STRINGS_HTC, 'Desire Z' ],
 		'HTC DesireZ':								[ STRINGS_HTC, 'Desire Z' ],	
 		'HTC DesireZ A7272':						[ STRINGS_HTC, 'Desire Z' ],
@@ -685,6 +700,7 @@ var UserAgents = (function(){
 		'HTC EVO 3D X515a':							[ STRINGS_HTC, 'EVO 3D' ],
 		'HTC EVO 3D GSM X515m':						[ STRINGS_HTC, 'EVO 3D' ],
 		'HTC EVO 3D X515m':							[ STRINGS_HTC, 'EVO 3D' ],
+		'HTC EVO 3D X515M':							[ STRINGS_HTC, 'EVO 3D' ],
 		'HTC EVO3D X515a':							[ STRINGS_HTC, 'EVO 3D' ],
 		'HTC EVO3D X515m':							[ STRINGS_HTC, 'EVO 3D' ],
 		'HTC Evo 3D X515m':							[ STRINGS_HTC, 'EVO 3D' ],
@@ -698,7 +714,8 @@ var UserAgents = (function(){
 		'HTC Design 4G':							[ STRINGS_HTC, 'EVO Design 4G' ],		/* Sprint */
 		'HTC EVO design 4G':						[ STRINGS_HTC, 'EVO Design 4G' ],
 		'HTC EVO Design 4G':						[ STRINGS_HTC, 'EVO Design 4G' ],
-		'HTC EVO Shift 4G':							[ STRINGS_HTC, 'EVO Shift 4G' ],
+		'HTC Evo Shift':							[ STRINGS_HTC, 'EVO Shift' ],
+		'HTC EVO Shift 4G':							[ STRINGS_HTC, 'EVO Shift' ],
 		'HTC A310e':								[ STRINGS_HTC, 'Explorer' ],
 		'HTC Explorer':								[ STRINGS_HTC, 'Explorer' ],
 		'HTC Explorer A310b':						[ STRINGS_HTC, 'Explorer' ],
@@ -708,6 +725,7 @@ var UserAgents = (function(){
 		'HTC Flyer P510e':							[ STRINGS_HTC, 'Flyer', 'tablet' ],
 		'HTC Flyer P512':							[ STRINGS_HTC, 'Flyer', 'tablet' ],
 		'HTC Flyer P512 NA':						[ STRINGS_HTC, 'Flyer', 'tablet' ],
+		'HTC P515E':								[ STRINGS_HTC, 'Flyer 4G', 'tablet' ],
 		'HTC Gratia A6380':							[ STRINGS_HTC, 'Gratia' ],
 		'HTC HD':									[ STRINGS_HTC, 'HD' ],
 		'HTC HD2':									[ STRINGS_HTC, 'HD2' ],
@@ -748,10 +766,12 @@ var UserAgents = (function(){
 		'HTC Sapphire':								[ STRINGS_HTC, 'Magic' ],
 		'HTC Lexikon':								[ STRINGS_HTC, 'Merge' ],
 		'HTC One S':								[ STRINGS_HTC, 'One S' ],
+		'HTC Z520e':								[ STRINGS_HTC, 'One S' ],
 		'HTC One V':								[ STRINGS_HTC, 'One V' ],
 		'HTC T320e':								[ STRINGS_HTC, 'One V' ],
 		'HTC One X':								[ STRINGS_HTC, 'One X' ],
 		'HTC S720e':								[ STRINGS_HTC, 'One X' ],
+		'HTC Endeavour-LS':							[ STRINGS_HTC, 'One X' ],
 		'HTC One XL':								[ STRINGS_HTC, 'One XL' ],
 		'HTC X710a':								[ STRINGS_HTC, 'Raider 4G' ],
 		'HTC Raider':								[ STRINGS_HTC, 'Raider 4G' ],
@@ -761,6 +781,7 @@ var UserAgents = (function(){
 		'HTC PH39100':								[ STRINGS_HTC, 'Raider 4G' ],
 		'HTC Holiday':								[ STRINGS_HTC, 'Raider 4G' ],
 		'HTC Velocity 4G X710s':					[ STRINGS_HTC, 'Raider 4G' ],
+		'HTC Rezound':								[ STRINGS_HTC, 'Rezound' ],
 		'HTC Rhyme S510b':							[ STRINGS_HTC, 'Rhyme' ],				/* Verizon */
 		'HTC S510b':								[ STRINGS_HTC, 'Rhyme' ],
 		'HTC Bliss':								[ STRINGS_HTC, 'Rhyme' ],
@@ -812,6 +833,7 @@ var UserAgents = (function(){
 		'HTC Sensation XL with Beats Audio X315e':	[ STRINGS_HTC, 'Sensation XL' ],
 		'HTC Runnymede':							[ STRINGS_HTC, 'Sensation XL' ],
 		'HTC X315E':								[ STRINGS_HTC, 'Sensation XL' ],	
+		'HTC G21':									[ STRINGS_HTC, 'Sensation XL' ],
 		'HTC PH06130':								[ STRINGS_HTC, 'Status' ],
 		'HTC Status':								[ STRINGS_HTC, 'Status' ],
 		'HTC Tattoo':								[ STRINGS_HTC, 'Tattoo' ],
@@ -865,6 +887,7 @@ var UserAgents = (function(){
 		'Desire Z':									[ STRINGS_HTC, 'Desire Z' ],
 		'Dream':									[ STRINGS_HTC, 'Dream' ],
 		'Droid Incredible':							[ STRINGS_HTC, 'Droid Incredible' ],
+		'EVO':										[ STRINGS_HTC, 'EVO' ],
 		'Evo HD2':									[ STRINGS_HTC, 'EVO HD' ],
 		'Evo 3D Beats X515m':						[ STRINGS_HTC, 'EVO 3D' ],
 		'Evo 3D GSM':								[ STRINGS_HTC, 'EVO 3D' ],
@@ -882,6 +905,7 @@ var UserAgents = (function(){
 		'Incredible':								[ STRINGS_HTC, 'Droid Incredible' ],	/* Verizon */
 		'Incredible 2':								[ STRINGS_HTC, 'Droid Incredible 2' ],	/* Verizon */
 		'Incredible S':								[ STRINGS_HTC, 'Incredible S' ],
+		'IncredibleS S710e':						[ STRINGS_HTC, 'Incredible S' ],
 		'IncredibleS':								[ STRINGS_HTC, 'Incredible S' ],
 		'Inspire HD':								[ STRINGS_HTC, 'Inspire 4G' ],
 		'Inspire 4G':								[ STRINGS_HTC, 'Inspire 4G' ],
@@ -902,6 +926,7 @@ var UserAgents = (function(){
 		'Click':									[ STRINGS_HTC, 'Tattoo' ],
 		'Wildfire':									[ STRINGS_HTC, 'Wildfire' ],
 		'Wildfire S':								[ STRINGS_HTC, 'Wildfire S' ],
+		'Wildfire S A510e':							[ STRINGS_HTC, 'Wildfire S' ],
 		'Sprint APX515CKT':							[ STRINGS_HTC, 'EVO 3D' ],
 		'Sprint APA9292KT':							[ STRINGS_HTC, 'EVO 4G' ],
 		'Sprint APA7373KT':							[ STRINGS_HTC, 'EVO Shift 4G' ],
@@ -916,6 +941,7 @@ var UserAgents = (function(){
 		'X06HT':									[ STRINGS_HTC, 'Desire' ],
 		'001HT':									[ STRINGS_HTC, 'Desire HD' ],
 		'X325a':									[ STRINGS_HTC, 'One X' ],
+		'Z520m':									[ STRINGS_HTC, 'One S' ],
 		'Z710':										[ STRINGS_HTC, 'Sensation' ],
 		'Z710e':									[ STRINGS_HTC, 'Sensation' ],
 		'T9199h':									[ STRINGS_HTC, 'T9199h' ],
@@ -973,6 +999,7 @@ var UserAgents = (function(){
 		'Huawei U8850':								[ STRINGS_HUAWEI, 'Vision' ],
 		'Huawei U8652':								[ STRINGS_HUAWEI, 'Sonic' ],
 		'Huawei U8800-51':							[ STRINGS_HUAWEI, 'IDEOS X5' ],
+		'Huawei U8818':								[ STRINGS_HUAWEI, 'Ascend G300' ],
 		'Huawei U9000':								[ STRINGS_HUAWEI, 'Ascend X' ],
 		'Huawei IDEOS U8500':						[ STRINGS_HUAWEI, 'IDEOS X2' ],
 		'Huawei IDEOS U8650':						[ STRINGS_HUAWEI, 'Sonic' ],
@@ -1014,6 +1041,7 @@ var UserAgents = (function(){
 		'c8800':									[ STRINGS_HUAWEI, 'C8800' ],
 		'C8800':									[ STRINGS_HUAWEI, 'C8800' ],
 		'c8810':									[ STRINGS_HUAWEI, 'Ascend G300C' ],
+		'C8812':									[ STRINGS_HUAWEI, 'Ascend C8812' ],
 		'S8600':									[ STRINGS_HUAWEI, 'S8600' ],
 		'U8100':									[ STRINGS_HUAWEI, 'U8100' ],
 		'U8110':									[ STRINGS_HUAWEI, 'U8110' ],
@@ -1050,10 +1078,12 @@ var UserAgents = (function(){
 		'U9200':									[ STRINGS_HUAWEI, 'Ascend P1' ],
 		'U9200-1':									[ STRINGS_HUAWEI, 'Ascend P1' ],
 		'U9500':									[ STRINGS_HUAWEI, 'Ascend D1' ],
+		'U9501L':									[ STRINGS_HUAWEI, 'Ascend D LTE' ],
 		'U9510':									[ STRINGS_HUAWEI, 'Ascend D quad' ],
 		'U9510E':									[ STRINGS_HUAWEI, 'Ascend D quad' ],
 		'Comet':									[ STRINGS_HUAWEI, 'Comet' ],
 		'GS02':										[ STRINGS_HUAWEI, 'Honor' ],
+		'GS03':										[ STRINGS_HUAWEI, 'Ascend P1' ],
 		'DroniX-0.5':								[ STRINGS_HUAWEI, 'U8180' ],
 		'MTS-SP101':								[ STRINGS_HUAWEI, 'C8511' ],
 		'TSP21':									[ STRINGS_HUAWEI, 'U8110' ],								
@@ -1071,6 +1101,7 @@ var UserAgents = (function(){
 		'INQ Cloud Touch':							[ 'INQ', 'Cloud Touch' ],
 		'ILT-MX100':								[ 'iRiver', 'Tab', 'tablet' ],
 		'IVIO_DE38':								[ 'Ivio', 'DE38' ],
+		'JY-G2':									[ 'Jiayu', 'G2' ],
 		'JXD S601WIFI':								[ 'JXD', 'S601 WIFI', 'media' ],
 		'A2':										[ 'KakaTech', 'A2' ],
 		'D91':										[ 'KK', 'D91', 'tablet' ],
@@ -1091,8 +1122,11 @@ var UserAgents = (function(){
 		'M9300':									[ 'Kyocera', 'M9300' ],
 		'E800':										[ 'K-Touch', 'E800' ],
 		'W606':										[ 'K-Touch', 'W606' ],
+		'K-Touch W619':								[ 'K-Touch', 'W619' ],
+		'K-Touch W650':								[ 'K-Touch', 'W650' ],
 		'W700':										[ 'K-Touch', 'W700' ],
 		'W800':										[ 'K-Touch', 'W800' ],
+		'W806':										[ 'K-Touch', 'W806' ],
 		'W808':										[ 'K-Touch', 'W808' ],
 		'W810':										[ 'K-Touch', 'W810' ],
 		'X900':										[ 'Lava', 'XOLO X900' ],
@@ -1120,6 +1154,7 @@ var UserAgents = (function(){
 		'S1 37AHO':									[ STRINGS_LENOVO, 'LePhone S1-37AH0' ],
 		'Lenovo S2-38AH0':							[ STRINGS_LENOVO, 'LePhone S2-38AH0' ],
 		'Lenovo S2-38AT0':							[ STRINGS_LENOVO, 'LePhone S2-38AT0' ],
+		'Lenovo A288t':								[ STRINGS_LENOVO, 'LePhone A288' ],
 		'Lenovo A366t':								[ STRINGS_LENOVO, 'LePhone A366' ],
 		'Lenovo A390e':								[ STRINGS_LENOVO, 'LePhone A390' ],
 		'Lenovo A500':								[ STRINGS_LENOVO, 'LePhone A500' ],
@@ -1127,6 +1162,8 @@ var UserAgents = (function(){
 		'Lenovo A668t':								[ STRINGS_LENOVO, 'LePhone A668' ],
 		'Lenovo A698t':								[ STRINGS_LENOVO, 'LePhone A698' ],
 		'Lenovo A750':								[ STRINGS_LENOVO, 'LePhone A750' ],
+		'Lenovo A780':								[ STRINGS_LENOVO, 'LePhone A780' ],
+		'Lenovo A789':								[ STRINGS_LENOVO, 'LePhone A789' ],
 		'Lenovo A790e':								[ STRINGS_LENOVO, 'LePhone A790' ],
 		'Lenovo P70':								[ STRINGS_LENOVO, 'LePhone P70' ],
 		'Lenovo P700':								[ STRINGS_LENOVO, 'LePhone P700' ],
@@ -1149,9 +1186,13 @@ var UserAgents = (function(){
 		'LG-C800G':									[ STRINGS_LG, 'Eclypse' ],
 		'LG-CX670':									[ STRINGS_LG, 'Optimus 3G' ],
 		'LG-E400':									[ STRINGS_LG, 'Optimus L3' ],
+		'LG-E400f':									[ STRINGS_LG, 'Optimus L3' ],
 		'LG-E510':									[ STRINGS_LG, 'Optimus Hub' ],
 		'LG-E510f':									[ STRINGS_LG, 'Optimus Hub' ],
+		'LG-E510g':									[ STRINGS_LG, 'Optimus Hub' ],
 		'LG-E610':									[ STRINGS_LG, 'Optimus L5' ],
+		'LG-E612':									[ STRINGS_LG, 'Optimus L5' ],
+		'LG-E612g':									[ STRINGS_LG, 'Optimus L5' ],
 		'LG-E615F':									[ STRINGS_LG, 'E615' ],
 		'LG-E617G':									[ STRINGS_LG, 'E617' ],
 		'LG-E720':									[ STRINGS_LG, 'Optimus Chic' ],
@@ -1163,13 +1204,13 @@ var UserAgents = (function(){
 		'LG-F120K':									[ STRINGS_LG, 'Optimus LTE Tag' ],
 		'LG-F120L':									[ STRINGS_LG, 'Optimus LTE Tag' ],
 		'LG-F120S':									[ STRINGS_LG, 'Optimus LTE Tag' ],
-		'LG-F160K':									[ STRINGS_LG, 'F160K' ],
-		'LG-F160L':									[ STRINGS_LG, 'F160L' ],
-		'LG-F160S':									[ STRINGS_LG, 'F160S' ],
+		'LG-F160K':									[ STRINGS_LG, 'Optimus LTE II' ],
+		'LG-F160L':									[ STRINGS_LG, 'Optimus LTE II' ],
+		'LG-F160S':									[ STRINGS_LG, 'Optimus LTE II' ],
 		'LG-F180L':									[ STRINGS_LG, 'F180L' ],
 		'LG-GT540':									[ STRINGS_LG, 'Optimus' ],
 		'LG-GT540f':								[ STRINGS_LG, 'Optimus' ],
-		'LG GT540 Swift':							[ STRINGS_LG, 'Optimus' ],
+		'LG-GT540 Swift':							[ STRINGS_LG, 'Optimus' ],
 		'LG-GW620':									[ STRINGS_LG, 'GW620' ],
 		'LG-KH5200':								[ STRINGS_LG, 'Andro-1' ],
 		'LG-KU3700':								[ STRINGS_LG, 'Optimus One' ],
@@ -1193,10 +1234,12 @@ var UserAgents = (function(){
 		'LG-LU6800':								[ STRINGS_LG, 'Optimus Big' ],
 		'LG-LU8300':								[ STRINGS_LG, 'Optimus Pad LTE' ],
 		'LG-LW690':									[ STRINGS_LG, 'Optimus C' ],
+		'LG-LW770':									[ STRINGS_LG, 'LW770' ],
 		'LG-MS690':									[ STRINGS_LG, 'Optimus M' ],
 		'LG-MS770':									[ STRINGS_LG, 'MS770' ],
 		'LG-MS840':									[ STRINGS_LG, 'Connect 4G' ],
 		'LG-MS910':									[ STRINGS_LG, 'Esteem' ],
+		'LG-MS695':									[ STRINGS_LG, 'Optimus M+' ],
 		'LG P350':									[ STRINGS_LG, 'Optimus Me' ],
 		'LG-P350':									[ STRINGS_LG, 'Optimus Me' ],
 		'LG-P350f':									[ STRINGS_LG, 'Optimus Me' ],
@@ -1217,6 +1260,7 @@ var UserAgents = (function(){
 		'LG-P698f':									[ STRINGS_LG, 'Optimus Net' ],
 		'LG-P700':									[ STRINGS_LG, 'Optimus L7' ],
 		'LG-P705':									[ STRINGS_LG, 'Optimus L7' ],
+		'LG-P705f':									[ STRINGS_LG, 'Optimus L7' ],
 		'LG-P705g':									[ STRINGS_LG, 'Optimus L7' ],
 		'LG-P708g':									[ STRINGS_LG, 'P708' ],
 		'LG-P720':									[ STRINGS_LG, 'Optimus Chic' ],
@@ -1257,6 +1301,7 @@ var UserAgents = (function(){
 		'LG-V905R':									[ STRINGS_LG, 'Optimus G-Slate', 'tablet' ],
 		'LG-V909':									[ STRINGS_LG, 'Optimus G-Slate', 'tablet' ],
 		'LG-VM670':									[ STRINGS_LG, 'Optimus V' ],
+		'LG-VM696':									[ STRINGS_LG, 'Optimus Elite' ],
 		'LG-VM701':									[ STRINGS_LG, 'Optimus Slider' ],
 		'LG-VS660':									[ STRINGS_LG, 'Vortex' ],
 		'LG-VS700':									[ STRINGS_LG, 'Enlighten' ],
@@ -1264,6 +1309,7 @@ var UserAgents = (function(){
 		'LG-VS840':									[ STRINGS_LG, 'Connect 4G' ],
 		'LG-VS910':									[ STRINGS_LG, 'Revolution' ],
 		'lgp-970':									[ STRINGS_LG, 'Optimus Black' ],
+		'E900':										[ STRINGS_LG, 'Optimus 7' ],
 		'GT540':									[ STRINGS_LG, 'Optimus GT540' ],
 		'GW620':									[ STRINGS_LG, 'GW620' ],
 		'KU9500':									[ STRINGS_LG, 'Optimus Z' ],
@@ -1277,6 +1323,7 @@ var UserAgents = (function(){
 		'USCC-US730':								[ STRINGS_LG, 'US730' ],
 		'USCC-US760':								[ STRINGS_LG, 'Genesis' ],
 		'VM670':									[ STRINGS_LG, 'Optimus V' ],
+		'VS840 4G':									[ STRINGS_LG, 'Connect 4G' ],
 		'VS900-4G':									[ STRINGS_LG, 'VS900' ],
 		'VS910 4G':									[ STRINGS_LG, 'Revolution 4G' ],
 		'VS920 4G':									[ STRINGS_LG, 'Spectrum 4G' ],
@@ -1323,9 +1370,14 @@ var UserAgents = (function(){
 		'meizu m9':									[ 'Meizu', 'M9' ],
 		'MEIZU M9':									[ 'Meizu', 'M9' ],
 		'MEIZU MX':									[ 'Meizu', 'MX' ],
+		'M030':										[ 'Meizu', 'MX M030' ],
+		'M032':										[ 'Meizu', 'MX M032' ],
 		'Slidepad':									[ 'Memup', 'Slidepad', 'tablet' ],
+		'A45':										[ 'Micromax', 'A45 Punk' ],
+		'Micromax A50':								[ 'Micromax', 'A50 Ninja' ],
 		'Micromax A60':								[ 'Micromax', 'Andro A60' ],
 		'Micromax A70':								[ 'Micromax', 'Andro A70' ],
+		'P300(Funbook)':							[ 'Micromax', 'Funbook P300', 'tablet' ],
 		'AT735':									[ 'Moinstone', 'AT735', 'tablet' ],
 		'A853':										[ STRINGS_MOTOROLA, 'Milestone' ],
 		'A953':										[ STRINGS_MOTOROLA, 'Milestone 2' ],
@@ -1405,8 +1457,10 @@ var UserAgents = (function(){
 		'XT603':									[ STRINGS_MOTOROLA, 'ADMIRAL' ],
 		'XT610':									[ STRINGS_MOTOROLA, 'Droid Pro' ],
 		'XT615':									[ STRINGS_MOTOROLA, 'MOTO XT615' ],
+		'XT626':									[ STRINGS_MOTOROLA, 'MOTO XT626' ],
 		'XT681':									[ STRINGS_MOTOROLA, 'MOTO XT681' ],
 		'XT682':									[ STRINGS_MOTOROLA, 'Droid 3' ],
+		'XT685':									[ STRINGS_MOTOROLA, 'MOTO XT685' ],
 		'XT687':									[ STRINGS_MOTOROLA, 'ATRIX TV' ],
 		'XT701':									[ STRINGS_MOTOROLA, 'XT701' ],
 		'XT702':									[ STRINGS_MOTOROLA, 'MOTO XT702' ],
@@ -1423,14 +1477,18 @@ var UserAgents = (function(){
 		'XT883':									[ STRINGS_MOTOROLA, 'Milestone 3' ],
 		'XT889':									[ STRINGS_MOTOROLA, 'XT889' ],
 		'XT897':									[ STRINGS_MOTOROLA, 'Droid 4' ],
+		'XT901':									[ STRINGS_MOTOROLA, 'RAZR' ],
 		'XT910':									[ STRINGS_MOTOROLA, 'RAZR' ],
 		'XT910K':									[ STRINGS_MOTOROLA, 'RAZR' ],
 		'XT910S':									[ STRINGS_MOTOROLA, 'RAZR' ],
 		'XT910 4G':									[ STRINGS_MOTOROLA, 'RAZR' ],
 		'XT912':									[ STRINGS_MOTOROLA, 'Droid RAZR' ],
+		'XT923':									[ STRINGS_MOTOROLA, 'Droid RAZR HD' ],
+		'XT925':									[ STRINGS_MOTOROLA, 'Droid RAZR HD' ],
 		'XT926':									[ STRINGS_MOTOROLA, 'Droid RAZR' ],
 		'XT926 4G':									[ STRINGS_MOTOROLA, 'Droid RAZR' ],
 		'XT928':									[ STRINGS_MOTOROLA, 'XT928' ],
+		'Atrix 2':									[ STRINGS_MOTOROLA, 'ATRIX 2' ],
 		'Atrix 4g':									[ STRINGS_MOTOROLA, 'ATRIX 4G' ],
 		'Atrix 4G':									[ STRINGS_MOTOROLA, 'ATRIX 4G' ],
 		'Atrix 4G ME860':							[ STRINGS_MOTOROLA, 'ATRIX 4G' ],
@@ -1461,6 +1519,8 @@ var UserAgents = (function(){
 		'Droid Razr':								[ STRINGS_MOTOROLA, 'Droid RAZR' ],
 		'DROID RAZR':								[ STRINGS_MOTOROLA, 'Droid RAZR' ],
 		'DROID RAZR 4G':							[ STRINGS_MOTOROLA, 'Droid RAZR' ],
+		'DROID SPYDER':								[ STRINGS_MOTOROLA, 'Droid RAZR' ],
+		'DROID RAZR HD':							[ STRINGS_MOTOROLA, 'Droid RAZR HD' ],
 		'DROID RAZR HD 4G':							[ STRINGS_MOTOROLA, 'Droid RAZR HD' ],
 		'DroidX':									[ STRINGS_MOTOROLA, 'Droid X' ],
 		'DROIDX':									[ STRINGS_MOTOROLA, 'Droid X' ],
@@ -1517,6 +1577,7 @@ var UserAgents = (function(){
 		'Nokia N9':									[ 'Nokia', 'N9' ],
 		'Nokia N900':								[ 'Nokia', 'N900' ],
 		'Lumia800':									[ 'Nokia', 'Lumia 800' ],
+		'Lumia 900':								[ 'Nokia', 'Lumia 900' ],
 		'Notion Ink ADAM':							[ 'Notion Ink', 'ADAM', 'tablet' ],
 		'P4D SIRIUS':								[ 'Nvsbl', 'P4D SIRIUS', 'tablet' ],
 		'P4D Sirius':								[ 'Nvsbl', 'P4D SIRIUS', 'tablet' ],
@@ -1535,12 +1596,14 @@ var UserAgents = (function(){
 		'X905':										[ 'Oppo', 'Find 3 X905' ],
 		'OPPOX905':									[ 'Oppo', 'Find 3 X905' ],
 		'X9015':									[ 'Oppo', 'Find X9015' ],
+		'OPPOX9017':								[ 'Oppo', 'Finder X9017' ],
 		'OPPOR807':									[ 'Oppo', 'Real R807' ],
 		'OPPOT703':									[ 'Oppo', 'T703' ],
 		'P-01D':									[ 'Panasonic', 'P-01D' ],
 		'P-02D':									[ 'Panasonic', 'Lumix Phone' ],
 		'P-04D':									[ 'Panasonic', 'Eluga' ],
 		'P-07C':									[ 'Panasonic', 'P-07C' ],
+		'dL1':										[ 'Panasonic', 'Eluga dL1' ],
 		'101P':										[ 'Panasonic', 'Lumix Phone' ],
 		'JT-H580VT':								[ 'Panasonic', 'BizPad 7', 'tablet' ],
 		'JT-H581VT':								[ 'Panasonic', 'BizPad 10', 'tablet' ],
@@ -1567,8 +1630,11 @@ var UserAgents = (function(){
 		'IM-A810K':									[ STRINGS_PANTECH, 'SKY Vega LTE M' ],
 		'IM-A810S':									[ STRINGS_PANTECH, 'SKY Vega LTE M' ],
 		'IM-A820L':									[ STRINGS_PANTECH, 'SKY Vega LTE EX' ],
-		'IM-A830L':									[ STRINGS_PANTECH, 'IM-A830L' ],
-		'IM-A840S':									[ STRINGS_PANTECH, 'IM-A840S' ],
+		'IM-A830K':									[ STRINGS_PANTECH, 'SKY Vega Racer 2' ],
+		'IM-A830L':									[ STRINGS_PANTECH, 'SKY Vega Racer 2' ],
+		'IM-A830S':									[ STRINGS_PANTECH, 'SKY Vega Racer 2' ],
+		'IM-A840S':									[ STRINGS_PANTECH, 'SKY Vega S5' ],
+		'IM-A850K':									[ STRINGS_PANTECH, 'IM-A850K' ],	
 		'IM-T100K':									[ STRINGS_PANTECH, 'SKY Vega No. 5', 'tablet' ],
 		'IS06':										[ STRINGS_PANTECH, 'SIRIUS α' ],
 		'ADR8995':									[ STRINGS_PANTECH, 'Breakout' ],
@@ -1638,6 +1704,8 @@ var UserAgents = (function(){
 		'GT-I8150':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' W' ],
 		'GT-I8150B':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' W' ],
 		'GT-I8160':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace 2' ],
+		'GT-I8160L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace 2' ],
+		'GT-I8160P':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace 2' ],
 		'GT-I8320':									[ STRINGS_SAMSUNG, 'H1' ],
 		'GT-I8520':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Beam' ],
 		'GT-I8530':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Beam' ],
@@ -1678,6 +1746,7 @@ var UserAgents = (function(){
 		'GT-I9800':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' GT-I9800' ],
 		'GT-N7000':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
 		'GT-N7000B':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
+		'GT-N7100':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note II' ],
 		'GT-N8000':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note 10.1' ],
 		'GT-N8010':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note 10.1' ],
 		'GT-P1000':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', 'tablet' ],
@@ -1688,6 +1757,7 @@ var UserAgents = (function(){
 		'GT-P1000 Tablet':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', 'tablet' ],
 		'GT-P1010':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', 'tablet' ],
 		'GT-P3100':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 2 (7.0)', 'tablet' ],
+		'GT-P3100B':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 2 (7.0)', 'tablet' ],
 		'GT-P3110':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 2 (7.0)', 'tablet' ],
 		'GT-P3113':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 2 (7.0)', 'tablet' ],
 		'GT-P5100':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 2 (10.1)', 'tablet' ],
@@ -1720,6 +1790,7 @@ var UserAgents = (function(){
 		'GT-S5363':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y' ],
 		'GT-S5367':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y TV' ],
 		'GT-S5368':									[ STRINGS_SAMSUNG, 'GT-S5368' ],
+		'GT-S5369':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y' ],
 		'GT-S5570':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Mini' ],
 		'GT-S5570B':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Mini' ],
 		'GT-S5570I':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Mini' ],
@@ -1752,6 +1823,7 @@ var UserAgents = (function(){
 		'GT-S6702':									[ STRINGS_SAMSUNG, 'GT-S6702' ],
 		'GT-S6802':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace Duos' ],
 		'GT-S7500':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace Plus' ],
+		'GT-S7500L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace Plus' ],
 		'GT-S7500W':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace Plus' ],
 		'GT-T959':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Vibrant' ],
 		'SCH-i509':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y' ],
@@ -1784,9 +1856,11 @@ var UserAgents = (function(){
 		'SCH-I905':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1', 'tablet' ],
 		'SCH-I905 4G':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1', 'tablet' ],
 		'SCH-I909':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
+		'SCH-I915':									[ STRINGS_SAMSUNG, 'SCH-I915' ],
 		'SCH-I939':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
 		'SCH-M828C':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Precedent' ],
 		'SCH-M828C[9096483449]':					[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Precedent' ],
+		'SCH-R530U':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
 		'SCH-R680':									[ STRINGS_SAMSUNG, 'Repp' ],
 		'SCH-R720':									[ STRINGS_SAMSUNG, 'Admire' ],
 		'SCH-R730':									[ STRINGS_SAMSUNG, 'Transfix' ],
@@ -1797,8 +1871,9 @@ var UserAgents = (function(){
 		'SCH-R915':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Indulge' ],
 		'SCH-R920':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Attain 4G' ],
 		'SCH-R930':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Aviator' ],
-		'SCH-R940':									[ STRINGS_SAMSUNG, 'Tikal' ],
-		'SCH-S720C':								[ STRINGS_SAMSUNG, 'SCH-S720' ],
+		'SCH-R940':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Lightray' ],
+		'SCH-S720C':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Proclaim' ],
+		'SCH-S735C':								[ STRINGS_SAMSUNG, 'SCH-S735' ],
 		'SCH-W899':									[ STRINGS_SAMSUNG, 'SCH-W899' ],
 		'SCH-W999':									[ STRINGS_SAMSUNG, 'SCH-W999' ],
 		'SGH-I547':									[ STRINGS_SAMSUNG, 'SGH-I547' ],
@@ -1834,8 +1909,9 @@ var UserAgents = (function(){
 		'SGH-T589':									[ STRINGS_SAMSUNG, 'Gravity Smart' ],
 		'SGH-T589R':								[ STRINGS_SAMSUNG, 'Gravity Smart' ],
 		'SGH-T679':									[ STRINGS_SAMSUNG, 'Exhibit II 4G' ],
+		'SGH-T679M':								[ STRINGS_SAMSUNG, 'Exhibit II 4G' ],
 		'SGH-T759':									[ STRINGS_SAMSUNG, 'Exhibit 4G' ],
-		'SGH-T769':									[ STRINGS_SAMSUNG, 'SGH-T769' ],
+		'SGH-T769':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Blaze 4G' ],
 		'SGH-T839':									[ STRINGS_SAMSUNG, 'T-Mobile Sidekick' ],
 		'SGH-T849':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.0', 'tablet' ],
 		'SGH-T859':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1', 'tablet' ],
@@ -1858,7 +1934,9 @@ var UserAgents = (function(){
 		'SHV-E160K':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
 		'SHV-E160L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note LTE' ],
 		'SHV-E160S':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note LTE' ],
+		'SHV-E170K':								[ STRINGS_SAMSUNG, 'SHV-E170K' ],
 		'SHV-E170L':								[ STRINGS_SAMSUNG, 'SHV-E170L' ],
+		'SHV-E210K':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
 		'SHV-E210L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
 		'SHV-E210S':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
 		'SHW-M100S':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' A' ],
@@ -1889,7 +1967,7 @@ var UserAgents = (function(){
 		'SPH-D705':									[ STRINGS_SAMSUNG, 'Epic 4G 2' ],
 		'SPH-D710':									[ STRINGS_SAMSUNG, 'Epic 4G Touch' ],
 		'SPH-L700':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
-		'SPH-L710':									[ STRINGS_SAMSUNG, 'SPH-L710' ],
+		'SPH-L710':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
 		'SPH-M820':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Prevail' ],
 		'SPH-M820-BST':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Prevail' ],
 		'SPH-M580':									[ STRINGS_SAMSUNG, 'Replenish' ],
@@ -1951,10 +2029,12 @@ var UserAgents = (function(){
 		'SBM103SH':									[ STRINGS_SHARP, 'Aquos 103SH' ],
 		'SBM104SH':									[ STRINGS_SHARP, 'Aquos 104SH' ],
 		'SBM107SH':									[ STRINGS_SHARP, 'Aquos 107SH' ],
+		'SBM107SHB':								[ STRINGS_SHARP, 'Aquos 107SH' ],
 		'SH-01D':									[ STRINGS_SHARP, 'Aquos SH-01D' ],
 		'SH-02D':									[ STRINGS_SHARP, 'Aquos slider SH-02D' ],
 		'SH-03C':									[ STRINGS_SHARP, 'Lynx 3D' ],
 		'SH-06D':									[ STRINGS_SHARP, 'Aquos SH-06D' ],
+		'SH-09D':									[ STRINGS_SHARP, 'Aquos Zeta SH-09D' ],
 		'SH-10B':									[ STRINGS_SHARP, 'Lynx' ],
 		'SH-12C':									[ STRINGS_SHARP, 'Aquos' ],
 		'SH-13C':									[ STRINGS_SHARP, 'Aquos f SH-13C' ],
@@ -1968,6 +2048,7 @@ var UserAgents = (function(){
 		'INFOBAR C01':								[ STRINGS_SHARP, 'INFOBAR C01' ],
 		'SPX-5':									[ 'Simvalley', 'SPX-5' ],
 		'SPX-5 3G':									[ 'Simvalley', 'SPX-5 3G' ],
+		'SmartQ G7':								[ 'SmartQ', 'G7', 'tablet' ],
 		'SmartQT7':									[ 'SmartQ', 'T7', 'tablet' ],
 		'SmartQT10':								[ 'SmartQ', 'T10', 'tablet' ],
 		'SmartQT15':								[ 'SmartQ', 'T15', 'tablet' ],
@@ -1996,10 +2077,12 @@ var UserAgents = (function(){
 		'LT22i':									[ 'Sony', STRINGS_XPERIA + ' P' ],
 		'LT26i':									[ 'Sony', STRINGS_XPERIA + ' S' ],
 		'LT26i-o':									[ 'Sony', STRINGS_XPERIA + ' S' ],
+		'LT28at':									[ 'Sony', STRINGS_XPERIA + ' Ion' ],
 		'LT28h':									[ 'Sony', STRINGS_XPERIA + ' Ion' ],
 		'LT28i':									[ 'Sony', STRINGS_XPERIA + ' Ion' ],
-		'LT29i':									[ 'Sony', STRINGS_XPERIA + ' Ion' ],
-		'SonyLT29i':								[ 'Sony', STRINGS_XPERIA + ' Ion' ],
+		'LT29i':									[ 'Sony', STRINGS_XPERIA + ' GX' ],
+		'SonyLT29i':								[ 'Sony', STRINGS_XPERIA + ' GX' ],
+		'SonyLT30a':								[ 'Sony', STRINGS_XPERIA + ' Mint' ],
 		'SonyLT30p':								[ 'Sony', STRINGS_XPERIA + ' Mint' ],
 		'MK16a':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Pro' ],
 		'MK16i':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Pro' ],
@@ -2037,6 +2120,7 @@ var UserAgents = (function(){
 		'ST21i':									[ 'Sony', '"Tapioca"' ],
 		'SonyST23i':								[ 'Sony', '"Tapioca DS"' ],
 		'ST25i':									[ 'Sony', STRINGS_XPERIA + ' U' ],
+		'ST27i':									[ 'Sony', STRINGS_XPERIA + ' Go' ],
 		'U20a':										[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10 Mini Pro' ],
 		'U20i':										[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10 Mini Pro' ],
 		'U20iv':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10 Mini Pro' ],
@@ -2065,6 +2149,7 @@ var UserAgents = (function(){
 		'SO-02D':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' NX' ],
 		'SO-03C':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Ray' ],
 		'SO-03D':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Acro HD' ],
+		'SO-04D':									[ 'Sony', STRINGS_XPERIA + ' GX' ],
 		'SO-05D':									[ 'Sony', STRINGS_XPERIA + ' SX' ],
 		'XPERIA X8':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X8' ],
 		'Xperia X8':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X8' ],
@@ -2073,6 +2158,7 @@ var UserAgents = (function(){
 		'Xperia Ray':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Ray' ],
 		'Xperia Arc':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc' ],
 		'Xperia Mini':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Mini' ],
+		'Xperia neo':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo' ],
 		'Xperia Neo':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo' ],
 		'XPERIA NEO':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo' ],
 		'Xperia NeoV':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo V' ],
@@ -2089,6 +2175,7 @@ var UserAgents = (function(){
 		'Spice Mi280':								[ 'Spice', 'Mi-280' ],
 		'Spice Mi300':								[ 'Spice', 'Mi-300' ],
 		'Spice Mi-310':								[ 'Spice', 'Mi-310' ],
+		'Spice Mi-425':								[ 'Spice', 'Mi-425' ],
 		'SPICE Mi-720':								[ 'Spice', 'Mi-720' ],
 		'A7272+':									[ 'Star', 'A7272+' ],
 		'e1109 v73 gq1002 ctp':						[ 'Star', 'X18i' ],
@@ -2127,11 +2214,12 @@ var UserAgents = (function(){
 		'IS04':										[ STRINGS_TOSHIBA, 'Regza IS04' ],
 		'IS11T':									[ STRINGS_TOSHIBA, 'Regza IS11T' ],
 		'AT1S0':									[ STRINGS_TOSHIBA, 'Regza AT1S0' ],
-		'Tostab03':									[ STRINGS_TOSHIBA, 'AT100', 'tablet' ],
-		'AT100':									[ STRINGS_TOSHIBA, 'AT100', 'tablet' ],
-		'AT200':									[ STRINGS_TOSHIBA, 'AT200', 'tablet' ],
-		'AT470':									[ STRINGS_TOSHIBA, 'AT470', 'tablet' ],
-		'AT830':									[ STRINGS_TOSHIBA, 'AT830', 'tablet' ],
+		'Tostab03':									[ STRINGS_TOSHIBA, 'Regza AT100', 'tablet' ],
+		'AT100':									[ STRINGS_TOSHIBA, 'Regza AT100', 'tablet' ],
+		'AT200':									[ STRINGS_TOSHIBA, 'Regza AT200', 'tablet' ],
+		'AT470':									[ STRINGS_TOSHIBA, 'Regza AT470', 'tablet' ],
+		'AT570':									[ STRINGS_TOSHIBA, 'Regza AT570', 'tablet' ],
+		'AT830':									[ STRINGS_TOSHIBA, 'Regza AT830', 'tablet' ],
 		'Folio 100':								[ STRINGS_TOSHIBA, 'Folio 100', 'tablet' ],
 		'folio100':									[ STRINGS_TOSHIBA, 'Folio 100', 'tablet' ],
 		'THRiVE':									[ STRINGS_TOSHIBA, 'THRiVE', 'tablet' ],
@@ -2159,8 +2247,11 @@ var UserAgents = (function(){
 		'N50GT':									[ 'Window', 'N50GT', 'tablet' ],
 		'N50GT A':									[ 'Window', 'N50GT-A', 'tablet' ],
 		'N70':										[ 'Window', 'N70', 'tablet' ],
+		'N70 DUAL CORE':							[ 'Window', 'N70 Dual Core', 'tablet' ],
 		'N80':										[ 'Window', 'N80', 'tablet' ],
 		'N90':										[ 'Window', 'N90', 'tablet' ],
+		'N90 DUAL CORE2 V12':						[ 'Window', 'N90 Dual Core', 'tablet' ],
+		'N612':										[ 'Wishway', 'N612' ],
 		'AT-AS43D':									[ 'Wolfgang', 'AT-AS43D' ],
 		'M12':										[ 'Wopad', 'M12', 'tablet' ],
 		'WM8650':									[ 'WonderMedia', 'WM8650', 'tablet' ],
@@ -2242,6 +2333,7 @@ var UserAgents = (function(){
 		'ZTE-C N760':								[ STRINGS_ZTE, 'C-N760' ],
 		'ZTE-C N880':								[ STRINGS_ZTE, 'C-N880' ],
 		'ZTE-C N880S':								[ STRINGS_ZTE, 'C-N880' ],
+		'ZTE-C N880s':								[ STRINGS_ZTE, 'C-N880' ],
 		'ZTE-C X500':								[ STRINGS_ZTE, 'C-X500' ],
 		'ZTE-C X920':								[ STRINGS_ZTE, 'C-X920' ],
 		'ZXY-ZTE-C X920':							[ STRINGS_ZTE, 'C-X920' ],
@@ -2905,7 +2997,7 @@ var UserAgents = (function(){
 				if (ua.match('Pre\/3.0')) 		{ this.device.manufacturer = 'HP'; this.device.model = 'Pre 3'; this.device.identified = true; }
 				if (ua.match('Pixi\/1.0')) 		{ this.device.manufacturer = 'Palm'; this.device.model = 'Pixi'; this.device.identified = true; }
 				if (ua.match('Pixi\/1.1')) 		{ this.device.manufacturer = 'Palm'; this.device.model = 'Pixi Plus'; this.device.identified = true; }
-				if (ua.match('P160UNA\/1.0')) 	{ this.device.manufacturer = 'HP'; this.device.model = 'Veer'; this.device.identified = true; }
+				if (ua.match('P160UN?A?\/1.0')) { this.device.manufacturer = 'HP'; this.device.model = 'Veer'; this.device.identified = true; }
 			}
 
 			/****************************************************
@@ -3019,7 +3111,6 @@ var UserAgents = (function(){
 				}
 			}
 
-				
 			/****************************************************
 			 *		WebOS
 			 */
@@ -3040,7 +3131,7 @@ var UserAgents = (function(){
 				if (ua.match('Pre\/3.0')) this.device.model = 'Pre3';
 				if (ua.match('Pixi\/1.0')) this.device.model = 'Pixi';
 				if (ua.match('Pixi\/1.1')) this.device.model = 'Pixi Plus';
-				if (ua.match('P160UNA\/1.0')) this.device.model = 'Veer';
+				if (ua.match('P160UN?A?\/1.0')) this.device.model = 'Veer';
 				if (ua.match('TouchPad\/1.0')) this.device.model = 'TouchPad';
 				
 				if (ua.match('Emulator\/') || ua.match('Desktop\/')) {

From bc24bbd745e9ed8cc1d0cef90639ce80d8a7c522 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 23 Sep 2012 20:45:34 +0200
Subject: [PATCH 021/174] Update test version to 4.0

---
 index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 15bb8f17..d2d6cd78 100644
--- a/index.html
+++ b/index.html
@@ -387,8 +387,8 @@ <h2>
 				
 				/* Submit results */
 				var payload = '{' +
-							  '"version": "3",' +
-							  '"revision": "17",' +
+							  '"version": "4",' +
+							  '"revision": "0",' +
 							  '"uniqueid": "' + r.uniqueid + '",' +
 							  '"score": ' + r.score + ',' +
 							  '"bonus": ' + r.bonus + ',' +

From 810844d075c3b4eb7c1293d01859183a415f6ecc Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 23 Sep 2012 21:03:37 +0200
Subject: [PATCH 022/174] Update file input black list so that it actually
 works

---
 scripts/engine.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/engine.js b/scripts/engine.js
index 064922ce..6b8b3479 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -11,7 +11,7 @@ Test = (function() {
 			[ testWebAudio, testAnimation ]
 		],
 		
-		initialize: function(c) {					
+		initialize: function(c) {
 			blacklists = {
 				fileField: 			Browsers.isOs('iOS', '<', '6'), 
 				dateFields:			Browsers.isBrowser('Maxthon') || Browsers.isBrowser('UC Browser'),
@@ -1575,13 +1575,13 @@ Test = (function() {
 			
 			group.setItem({
 				id:			'element',
-				passed:		!blacklists.fileInput && element.field.type == 'file',
+				passed:		!blacklists.fileField && element.field.type == 'file',
 				value: 		0
 			});
 
 			group.setItem({
 				id:			'files',
-				passed:		!blacklists.fileInput && element.field.files && element.field.files instanceof FileList,
+				passed:		!blacklists.fileField && element.field.files && element.field.files instanceof FileList,
 				value: 		1
 			});
 

From fc27938b53c42dd6252682bad7f347d19b984ee1 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 23 Sep 2012 21:04:20 +0200
Subject: [PATCH 023/174] Remove showModalDialog test because it really sucks
 and I don't think we should promote the use of it

---
 scripts/data.js   | 8 --------
 scripts/engine.js | 6 ------
 2 files changed, 14 deletions(-)

diff --git a/scripts/data.js b/scripts/data.js
index a2f2f1e4..4c0b9f02 100644
--- a/scripts/data.js
+++ b/scripts/data.js
@@ -1133,14 +1133,6 @@ var tests = [
 						id:			'spellcheck',
 						name: 		'<code>spellcheck</code> attribute', 
 						url:		'http://www.w3.org/TR/html5/editing.html#attr-spellcheck'
-					},
-
-					'<strong>Dialogs</strong>',
-					
-					{
-						id:			'modaldialog',
-						name: 		'<code>showModalDialog</code> method', 
-						url:		'http://www.whatwg.org/specs/web-apps/current-work/multipage/timers.html#dom-showmodaldialog'
 					}
 				]
 	}, {
diff --git a/scripts/engine.js b/scripts/engine.js
index 6b8b3479..602635da 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -2227,12 +2227,6 @@ Test = (function() {
 				passed:		!!('spellcheck' in element), 
 				value: 		1
 			});
-
-			this.section.setItem({
-				id:			'modaldialog',
-				passed:		'showModalDialog' in window, 
-				value: 		2
-			});
 		}			
 	};
 

From be336569cf2d5fb2a8b05c8a4aa6169f37cd4a48 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 23 Sep 2012 21:08:40 +0200
Subject: [PATCH 024/174] Redistribute some points

---
 scripts/engine.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/engine.js b/scripts/engine.js
index 602635da..4a817696 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -2163,7 +2163,7 @@ Test = (function() {
 			group.setItem({
 				id:			'contentEditable',
 				passed:		'contentEditable' in element && whitelists.contentEditable, 
-				value: 		8
+				value: 		9
 			});
 
 			group.setItem({
@@ -2225,7 +2225,7 @@ Test = (function() {
 			this.section.setItem({
 				id:			'spellcheck',
 				passed:		!!('spellcheck' in element), 
-				value: 		1
+				value: 		2
 			});
 		}			
 	};

From 1e455efcbdb97c08d147aa40470efbbc137bc0d2 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 23 Sep 2012 22:49:23 +0200
Subject: [PATCH 025/174] Support detecting AliyunOS

---
 scripts/useragents.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 8c6d2507..619948ec 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -3000,6 +3000,15 @@ var UserAgents = (function(){
 				if (ua.match('P160UN?A?\/1.0')) { this.device.manufacturer = 'HP'; this.device.model = 'Veer'; this.device.identified = true; }
 			}
 
+			if (ua.match('AliyunOS')) {
+				this.os.name = 'Aliyun OS';
+				this.os.version = null;
+
+				if (match = /AliyunOS ([0-9.]+)/.exec(ua)) {
+					this.os.version = new Version({ value: match[1], details: 3 })
+				}
+			}
+
 			/****************************************************
 			 *		Google TV
 			 */

From c8f43ad342d057dcddd5a38fc4286bca15d401e4 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 23 Sep 2012 22:49:42 +0200
Subject: [PATCH 026/174] Support detecting Baidu Browser

---
 scripts/useragents.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 619948ec..e4c017b8 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -4896,6 +4896,7 @@ var UserAgents = (function(){
 				{ name: 'Abrowser', 			regexp: /Abrowser\/([0-9.]*)/ },
 				{ name: 'arora', 				regexp: /[Aa]rora\/([0-9.]*)/ },
 				{ name: 'Baidu Browser', 		regexp: /M?BaiduBrowser\/([0-9.]*)/i },
+				{ name: 'Baidu Browser', 		regexp: /FlyFlow\/([0-9.]*)/, details: 2 },
 				{ name: 'Camino', 				regexp: /Camino\/([0-9.]*)/ },
 				{ name: 'Canure',				regexp: /Canure\/([0-9.]*)/, details: 3 },
 				{ name: 'CometBird', 			regexp: /CometBird\/([0-9.]*)/ },

From 5516c8271316cab431c403e9b84f021b64cf40eb Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 23 Sep 2012 22:50:01 +0200
Subject: [PATCH 027/174] Many new devices

---
 scripts/useragents.js | 50 +++++++++++++++++++++++++++++++++++++------
 1 file changed, 43 insertions(+), 7 deletions(-)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index e4c017b8..37066142 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -718,6 +718,7 @@ var UserAgents = (function(){
 		'HTC EVO Shift 4G':							[ STRINGS_HTC, 'EVO Shift' ],
 		'HTC A310e':								[ STRINGS_HTC, 'Explorer' ],
 		'HTC Explorer':								[ STRINGS_HTC, 'Explorer' ],
+		'HTC Explorer A310':						[ STRINGS_HTC, 'Explorer' ],
 		'HTC Explorer A310b':						[ STRINGS_HTC, 'Explorer' ],
 		'HTC Explorer A310e':						[ STRINGS_HTC, 'Explorer' ],
 		'HTC P510e':								[ STRINGS_HTC, 'Flyer', 'tablet' ],
@@ -985,6 +986,7 @@ var UserAgents = (function(){
 		'Huawei C8800':								[ STRINGS_HUAWEI, 'IDEOS X5' ],
 		'Huawei C8810':								[ STRINGS_HUAWEI, 'Ascend G300' ],
 		'Huawei C8812':								[ STRINGS_HUAWEI, 'Ascend C8812' ],
+		'Huawei C8825D':							[ STRINGS_HUAWEI, 'Ascend G330C' ],
 		'Huawei C8860E':							[ STRINGS_HUAWEI, 'Honor' ],
 		'Huawei M835':								[ STRINGS_HUAWEI, 'M835' ],
 		'Huawei M860':								[ STRINGS_HUAWEI, 'Ascend' ],
@@ -998,6 +1000,7 @@ var UserAgents = (function(){
 		'Huawei U8815':								[ STRINGS_HUAWEI, 'Ascend G300' ],
 		'Huawei U8850':								[ STRINGS_HUAWEI, 'Vision' ],
 		'Huawei U8652':								[ STRINGS_HUAWEI, 'Sonic' ],
+		'Huawei U8661':								[ STRINGS_HUAWEI, 'Sonic+' ],
 		'Huawei U8800-51':							[ STRINGS_HUAWEI, 'IDEOS X5' ],
 		'Huawei U8818':								[ STRINGS_HUAWEI, 'Ascend G300' ],
 		'Huawei U9000':								[ STRINGS_HUAWEI, 'Ascend X' ],
@@ -1070,7 +1073,9 @@ var UserAgents = (function(){
 		'U8800Pro':									[ STRINGS_HUAWEI, 'IDEOS X5 Pro' ],
 		'u8800pro':									[ STRINGS_HUAWEI, 'IDEOS X5 Pro' ],
 		'U8800 Pro':								[ STRINGS_HUAWEI, 'IDEOS X5 Pro' ],
+		'U8815':									[ STRINGS_HUAWEI, 'Ascend G300' ],
 		'U8818':									[ STRINGS_HUAWEI, 'Ascend G300' ],
+		'U8820':									[ STRINGS_HUAWEI, 'Titan' ],
 		'U8850':									[ STRINGS_HUAWEI, 'Vision' ],
 		'u8860':									[ STRINGS_HUAWEI, 'Honor' ],
 		'U8860':									[ STRINGS_HUAWEI, 'Honor' ],
@@ -1120,6 +1125,7 @@ var UserAgents = (function(){
 		'C5155':									[ 'Kyocera', 'C5155' ],
 		'C5170':									[ 'Kyocera', 'C5170' ],
 		'M9300':									[ 'Kyocera', 'M9300' ],
+		'K-Touch E619':								[ 'K-Touch', 'E619' ],
 		'E800':										[ 'K-Touch', 'E800' ],
 		'W606':										[ 'K-Touch', 'W606' ],
 		'K-Touch W619':								[ 'K-Touch', 'W619' ],
@@ -1159,12 +1165,14 @@ var UserAgents = (function(){
 		'Lenovo A390e':								[ STRINGS_LENOVO, 'LePhone A390' ],
 		'Lenovo A500':								[ STRINGS_LENOVO, 'LePhone A500' ],
 		'Lenovo A520':								[ STRINGS_LENOVO, 'LePhone A520' ],
+		'Lenovo A520GRAY':							[ STRINGS_LENOVO, 'LePhone A520' ],
 		'Lenovo A668t':								[ STRINGS_LENOVO, 'LePhone A668' ],
 		'Lenovo A698t':								[ STRINGS_LENOVO, 'LePhone A698' ],
 		'Lenovo A750':								[ STRINGS_LENOVO, 'LePhone A750' ],
 		'Lenovo A780':								[ STRINGS_LENOVO, 'LePhone A780' ],
 		'Lenovo A789':								[ STRINGS_LENOVO, 'LePhone A789' ],
 		'Lenovo A790e':								[ STRINGS_LENOVO, 'LePhone A790' ],
+		'Lenovo K860':								[ STRINGS_LENOVO, 'LePhone K860' ],
 		'Lenovo P70':								[ STRINGS_LENOVO, 'LePhone P70' ],
 		'Lenovo P700':								[ STRINGS_LENOVO, 'LePhone P700' ],
 		'Lenovo S850e':								[ STRINGS_LENOVO, 'S850' ],
@@ -1181,12 +1189,14 @@ var UserAgents = (function(){
 		'LePanII':									[ 'Le Pan', 'II', 'tablet' ],
 		'LG-C555':									[ STRINGS_LG, 'Optimus Chat' ],
 		'LG-C555-parrot':							[ STRINGS_LG, 'Optimus Chat' ],
+		'LG-C660':									[ STRINGS_LG, 'Optimus Pro' ],
 		'LG-C660h':									[ STRINGS_LG, 'Optimus Pro' ],
 		'LG-C729':									[ STRINGS_LG, 'DoublePlay' ],
 		'LG-C800G':									[ STRINGS_LG, 'Eclypse' ],
 		'LG-CX670':									[ STRINGS_LG, 'Optimus 3G' ],
 		'LG-E400':									[ STRINGS_LG, 'Optimus L3' ],
 		'LG-E400f':									[ STRINGS_LG, 'Optimus L3' ],
+		'LG-E405f':									[ STRINGS_LG, 'Optimus L3 Dual' ],
 		'LG-E510':									[ STRINGS_LG, 'Optimus Hub' ],
 		'LG-E510f':									[ STRINGS_LG, 'Optimus Hub' ],
 		'LG-E510g':									[ STRINGS_LG, 'Optimus Hub' ],
@@ -1204,10 +1214,12 @@ var UserAgents = (function(){
 		'LG-F120K':									[ STRINGS_LG, 'Optimus LTE Tag' ],
 		'LG-F120L':									[ STRINGS_LG, 'Optimus LTE Tag' ],
 		'LG-F120S':									[ STRINGS_LG, 'Optimus LTE Tag' ],
+		'LG-F160':									[ STRINGS_LG, 'Optimus LTE II' ],
 		'LG-F160K':									[ STRINGS_LG, 'Optimus LTE II' ],
 		'LG-F160L':									[ STRINGS_LG, 'Optimus LTE II' ],
 		'LG-F160S':									[ STRINGS_LG, 'Optimus LTE II' ],
-		'LG-F180L':									[ STRINGS_LG, 'F180L' ],
+		'LG-F180L':									[ STRINGS_LG, 'Optimus G' ],
+		'LG-F180S':									[ STRINGS_LG, 'Optimus G' ],
 		'LG-GT540':									[ STRINGS_LG, 'Optimus' ],
 		'LG-GT540f':								[ STRINGS_LG, 'Optimus' ],
 		'LG-GT540 Swift':							[ STRINGS_LG, 'Optimus' ],
@@ -1238,6 +1250,7 @@ var UserAgents = (function(){
 		'LG-MS690':									[ STRINGS_LG, 'Optimus M' ],
 		'LG-MS770':									[ STRINGS_LG, 'MS770' ],
 		'LG-MS840':									[ STRINGS_LG, 'Connect 4G' ],
+		'LG-MS870':									[ STRINGS_LG, 'MS870' ],
 		'LG-MS910':									[ STRINGS_LG, 'Esteem' ],
 		'LG-MS695':									[ STRINGS_LG, 'Optimus M+' ],
 		'LG P350':									[ STRINGS_LG, 'Optimus Me' ],
@@ -1282,6 +1295,7 @@ var UserAgents = (function(){
 		'LG-P936':									[ STRINGS_LG, 'Optimus LTE' ],
 		'LG-P940':									[ STRINGS_LG, 'PRADA 3.0' ],
 		'LG-P970':									[ STRINGS_LG, 'Optimus Black' ],
+		'LG-P970g':									[ STRINGS_LG, 'Optimus Black' ],
 		'LG-P970h':									[ STRINGS_LG, 'Optimus Black' ],
 		'LG-P990':									[ STRINGS_LG, 'Optimus 2X Speed' ],
 		'LG-P990h':									[ STRINGS_LG, 'Optimus 2X Speed' ],
@@ -1478,6 +1492,7 @@ var UserAgents = (function(){
 		'XT889':									[ STRINGS_MOTOROLA, 'XT889' ],
 		'XT897':									[ STRINGS_MOTOROLA, 'Droid 4' ],
 		'XT901':									[ STRINGS_MOTOROLA, 'RAZR' ],
+		'XT907':									[ STRINGS_MOTOROLA, 'Droid RAZR Mini' ],
 		'XT910':									[ STRINGS_MOTOROLA, 'RAZR' ],
 		'XT910K':									[ STRINGS_MOTOROLA, 'RAZR' ],
 		'XT910S':									[ STRINGS_MOTOROLA, 'RAZR' ],
@@ -1706,6 +1721,7 @@ var UserAgents = (function(){
 		'GT-I8160':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace 2' ],
 		'GT-I8160L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace 2' ],
 		'GT-I8160P':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace 2' ],
+		'GT-I8250':									[ STRINGS_SAMSUNG, 'GT-I8250' ],
 		'GT-I8320':									[ STRINGS_SAMSUNG, 'H1' ],
 		'GT-I8520':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Beam' ],
 		'GT-I8530':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Beam' ],
@@ -1721,6 +1737,7 @@ var UserAgents = (function(){
 		'GT-I9008L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
 		'GT-I9010':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Giorgio Armani' ],
 		'GT-I9018':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' GT-I9018' ],
+		'GT-I9050':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' GT-I9050' ],
 		'GT-I9070':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Advance' ],
 		'GT-I9070P':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Advance' ],
 		'GT-I9088':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
@@ -1747,8 +1764,10 @@ var UserAgents = (function(){
 		'GT-N7000':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
 		'GT-N7000B':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
 		'GT-N7100':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note II' ],
+		'GT-N7105':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note II' ],
 		'GT-N8000':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note 10.1' ],
 		'GT-N8010':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note 10.1' ],
+		'GT-N8013':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note 10.1' ],
 		'GT-P1000':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', 'tablet' ],
 		'GT-P1000L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', 'tablet' ],
 		'GT-P1000M':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', 'tablet' ],
@@ -1784,6 +1803,7 @@ var UserAgents = (function(){
 		'GT-P7510':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1', 'tablet' ],
 		'GT-P7511':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1N', 'tablet' ],
 		'GT-S5300':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Pocket' ],
+		'GT-S5302':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Pocket Duos' ],
 		'GT-S5360':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y' ],
 		'GT-S5360B':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y' ],
 		'GT-S5360L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y' ],
@@ -1818,6 +1838,7 @@ var UserAgents = (function(){
 		'GT-S5839i':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace' ],
 		'GT-S6102':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y Duos' ],
 		'GT-S6102B':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y Duos' ],
+		'GT-S6102E':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y Duos' ],
 		'GT-S6500':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Mini 2' ],
 		'GT-S6500D':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Mini 2' ],
 		'GT-S6702':									[ STRINGS_SAMSUNG, 'GT-S6702' ],
@@ -1839,9 +1860,11 @@ var UserAgents = (function(){
 		'SCH-i929':									[ STRINGS_SAMSUNG, 'SCH-i929' ],
 		'SCH-I100':									[ STRINGS_SAMSUNG, 'Gem' ],
 		'SCH-I110':									[ STRINGS_SAMSUNG, 'Illusion' ],
+		'SCH-I200':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Stellar' ],
 		'SCH-I400':									[ STRINGS_SAMSUNG, 'Continuum' ],
 		'SCH-I405':									[ STRINGS_SAMSUNG, 'Stratosphere' ],
 		'SCH-I405 4G':								[ STRINGS_SAMSUNG, 'Stratosphere' ],
+		'SCH-I405U':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Metrix' ],
 		'SCH-I500':									[ STRINGS_SAMSUNG, 'Fascinate' ],
 		'SCH-I510':									[ STRINGS_SAMSUNG, 'Stealth V' ],
 		'SCH-I510 4G':								[ STRINGS_SAMSUNG, 'Droid Charge' ],
@@ -1888,6 +1911,7 @@ var UserAgents = (function(){
 		'SGH-I747M':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
 		'SGH-I748':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
 		'SGH-I757':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II Skyrocket HD' ],
+		'SGH-I757M':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II Skyrocket HD' ],
 		'SGH-I777':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
 		'SGH-I9777':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
 		'SGH-I896':									[ STRINGS_SAMSUNG, 'Captivate' ],
@@ -1929,6 +1953,7 @@ var UserAgents = (function(){
 		'SHV-E120L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II HD LTE' ],
 		'SHV-E120S':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II HD LTE' ],
 		'SHV-E110S':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II LTE' ],
+		'SHV-E140K':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 8.9', 'tablet' ],
 		'SHV-E140S':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 8.9', 'tablet' ],
 		'SHV-E150S':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.7', 'tablet' ],
 		'SHV-E160K':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
@@ -1939,6 +1964,7 @@ var UserAgents = (function(){
 		'SHV-E210K':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
 		'SHV-E210L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
 		'SHV-E210S':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
+		'SHV-E250S':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note II' ],
 		'SHW-M100S':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' A' ],
 		'SHW-M110S':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
 		'SHW-M130L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' U' ],
@@ -2077,6 +2103,7 @@ var UserAgents = (function(){
 		'LT22i':									[ 'Sony', STRINGS_XPERIA + ' P' ],
 		'LT26i':									[ 'Sony', STRINGS_XPERIA + ' S' ],
 		'LT26i-o':									[ 'Sony', STRINGS_XPERIA + ' S' ],
+		'LT26w':									[ 'Sony', STRINGS_XPERIA + ' Acro S' ],
 		'LT28at':									[ 'Sony', STRINGS_XPERIA + ' Ion' ],
 		'LT28h':									[ 'Sony', STRINGS_XPERIA + ' Ion' ],
 		'LT28i':									[ 'Sony', STRINGS_XPERIA + ' Ion' ],
@@ -2113,12 +2140,14 @@ var UserAgents = (function(){
 		'ST18i':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Ray' ],
 		'ST18iv':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Ray' ],
 		'ST18av':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Ray' ],
-		'SonyST21':									[ 'Sony', '"Tapioca"' ],
-		'SonyST21i':								[ 'Sony', '"Tapioca"' ],
-		'SonyST21a2':								[ 'Sony', '"Tapioca"' ],
-		'ST21':										[ 'Sony', '"Tapioca"' ],
-		'ST21i':									[ 'Sony', '"Tapioca"' ],
-		'SonyST23i':								[ 'Sony', '"Tapioca DS"' ],
+		'SonyST21':									[ 'Sony', STRINGS_XPERIA + ' Tipo' ],
+		'SonyST21i':								[ 'Sony', STRINGS_XPERIA + ' Tipo' ],
+		'SonyST21a2':								[ 'Sony', STRINGS_XPERIA + ' Tipo' ],
+		'SonyST21i2':								[ 'Sony', STRINGS_XPERIA + ' Tipo' ],
+		'ST21':										[ 'Sony', STRINGS_XPERIA + ' Tipo' ],
+		'ST21i':									[ 'Sony', STRINGS_XPERIA + ' Tipo' ],
+		'SonyST23i':								[ 'Sony', STRINGS_XPERIA + ' Miro' ],
+		'ST23i':									[ 'Sony', STRINGS_XPERIA + ' Miro' ],
 		'ST25i':									[ 'Sony', STRINGS_XPERIA + ' U' ],
 		'ST27i':									[ 'Sony', STRINGS_XPERIA + ' Go' ],
 		'U20a':										[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10 Mini Pro' ],
@@ -2157,6 +2186,7 @@ var UserAgents = (function(){
 		'Xperia ray':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Ray' ],
 		'Xperia Ray':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Ray' ],
 		'Xperia Arc':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc' ],
+		'Xperia Arc S':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc S' ],
 		'Xperia Mini':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Mini' ],
 		'Xperia neo':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo' ],
 		'Xperia Neo':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo' ],
@@ -2175,6 +2205,7 @@ var UserAgents = (function(){
 		'Spice Mi280':								[ 'Spice', 'Mi-280' ],
 		'Spice Mi300':								[ 'Spice', 'Mi-300' ],
 		'Spice Mi-310':								[ 'Spice', 'Mi-310' ],
+		'Spice Mi-355':								[ 'Spice', 'Mi-355' ],
 		'Spice Mi-425':								[ 'Spice', 'Mi-425' ],
 		'SPICE Mi-720':								[ 'Spice', 'Mi-720' ],
 		'A7272+':									[ 'Star', 'A7272+' ],
@@ -2347,11 +2378,15 @@ var UserAgents = (function(){
 		'u880':										[ STRINGS_ZTE, 'U880' ],
 		'ZTE U880E':								[ STRINGS_ZTE, 'U880E' ],
 		'U880':										[ STRINGS_ZTE, 'U880' ],
+		'ZTE U885':									[ STRINGS_ZTE, 'U885' ],
+		'ZTE U930':									[ STRINGS_ZTE, 'U930' ],
 		'ZTE U970':									[ STRINGS_ZTE, 'U970' ],
 		'ZTE V768':									[ STRINGS_ZTE, 'V768' ],
+		'ZTE V788D':								[ STRINGS_ZTE, 'V788' ],
 		'ZTE-V856':									[ STRINGS_ZTE, 'V856' ],
 		'ZTE V877b':								[ STRINGS_ZTE, 'V877' ],
 		'ZTE V889D':								[ STRINGS_ZTE, 'V889' ],
+		'ZTE V970':									[ STRINGS_ZTE, 'Z970' ],
 		'ZTE-Z990':									[ STRINGS_ZTE, 'Z990' ],
 		'003Z':										[ STRINGS_ZTE, 'Softbank 003Z' ],
 		'008Z':										[ STRINGS_ZTE, 'Softbank 008Z' ],
@@ -5397,6 +5432,7 @@ var UserAgents = (function(){
 		s = s.replace(/^Full Android/, '');
 
 		s = s.replace(/^Acer ?/i, '');
+		s = s.replace(/^Iconia Tab /, '');
 		s = s.replace(/^Iconia /, '');
 		s = s.replace(/^Ainol /, '');
 		s = s.replace(/^Coolpad ?/i, 'Coolpad ');

From b50894a8509e1bfdfef7c2aade3c6b3bb9159f20 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Mon, 24 Sep 2012 08:41:05 +0200
Subject: [PATCH 028/174] Add more television browsers

---
 scripts/useragents.js | 39 +++++++++++++++++++++++++++++++++------
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 37066142..940814f0 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -3785,6 +3785,20 @@ var UserAgents = (function(){
 				this.device.identified = true;
 			}
 			
+			/****************************************************
+			 *		NetRange MMH 
+			 */
+
+			if (ua.match('NETRANGEMMH')) {
+				this.os.name = '';
+				this.os.version = null;
+				this.browser.name = '';
+				this.browser.version = null;
+				this.device.model = 'NetRange MMH';
+				this.device.type = 'television';
+				this.device.identified = true;
+			}
+
 			/****************************************************
 			 *		MachBlue XT
 			 */
@@ -3885,16 +3899,18 @@ var UserAgents = (function(){
 				
 				if (!this.device.manufacturer && vendorName != '' && vendorName != 'vendorName') {
 					switch(vendorName) {
-						case 'LGE':		this.device.manufacturer = 'LG'; break;
-						case 'TOSHIBA':	this.device.manufacturer = 'Toshiba'; break;
-						case 'smart':	this.device.manufacturer = 'Smart'; break;
-						case 'tv2n':	this.device.manufacturer = 'TV2N'; break;
-						default:		this.device.manufacturer = vendorName;
+						case 'LG Electronics':	this.device.manufacturer = 'LG'; break;
+						case 'LGE':				this.device.manufacturer = 'LG'; break;
+						case 'TOSHIBA':			this.device.manufacturer = 'Toshiba'; break;
+						case 'smart':			this.device.manufacturer = 'Smart'; break;
+						case 'tv2n':			this.device.manufacturer = 'TV2N'; break;
+						default:				this.device.manufacturer = vendorName;
 					}
 
 					if (!this.device.model && modelName != '' && modelName != 'modelName') {
 						switch(modelName) {
 							case 'GLOBAL_PLAT3':	this.device.model = 'NetCast TV'; break;
+							case 'GLOBAL_PLAT4':	this.device.model = 'NetCast TV'; break;
 							case 'SmartTV2012':		this.device.model = 'Smart TV 2012'; break;
 							case 'videoweb':		this.device.model = 'Videoweb'; break;
 							default:				this.device.model = modelName;
@@ -4549,7 +4565,7 @@ var UserAgents = (function(){
 			 *		NetFront
 			 */
 		
-			if (ua.match('NetFront')) {
+			if (ua.match('Net[fF]ront')) {
 				this.browser.name = 'NetFront';
 				this.device.type = 'mobile';
 
@@ -4649,6 +4665,15 @@ var UserAgents = (function(){
 				}
 			}
 
+			/****************************************************
+			 *		LG Browser
+			 */
+			if (match = /LG Browser\/([0-9.]*)/.exec(ua)) {
+				this.browser.name = 'LG Browser';
+				this.browser.version = new Version({ value: match[1], details: 2 });
+				this.device.type = 'television';
+			}
+			
 			/****************************************************
 			 *		Espial
 			 */
@@ -5121,6 +5146,8 @@ var UserAgents = (function(){
 			if (this.device.type == 'television' && this.browser.name == 'Opera') {
 				this.browser.name = 'Opera Devices';
 				switch (true) {
+					case this.engine.version.is('2.12'):	this.browser.version = new Version({ value: 3.4 }); break;
+					case this.engine.version.is('2.11'):	this.browser.version = new Version({ value: 3.3 }); break;
 					case this.engine.version.is('2.10'):	this.browser.version = new Version({ value: 3.2 }); break;
 					case this.engine.version.is('2.9'):		this.browser.version = new Version({ value: 3.1 }); break;
 					case this.engine.version.is('2.8'):		this.browser.version = new Version({ value: 3.0 }); break;

From 5f19e3b87f4235f7805c8c6050b222282afc18f1 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Mon, 24 Sep 2012 13:06:25 +0200
Subject: [PATCH 029/174] Add detection of older versions of Aliyun OS

---
 scripts/useragents.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 940814f0..2232bb26 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -3035,6 +3035,12 @@ var UserAgents = (function(){
 				if (ua.match('P160UN?A?\/1.0')) { this.device.manufacturer = 'HP'; this.device.model = 'Veer'; this.device.identified = true; }
 			}
 
+
+
+			/****************************************************
+			 *		Aliyun OS
+			 */
+		
 			if (ua.match('AliyunOS')) {
 				this.os.name = 'Aliyun OS';
 				this.os.version = null;
@@ -3044,6 +3050,20 @@ var UserAgents = (function(){
 				}
 			}
 
+			if (ua.match('Android')) {
+				if (match = /Android v(1.[0-9][0-9])_[0-9][0-9].[0-9][0-9]-/.exec(ua)) {
+					this.os.name = 'Aliyun OS';
+					this.os.version = new Version({ value: match[1], details: 3 })
+				}
+	
+				if (match = /Android (1.[0-9].[0-9].[0-9]+)-R?T/.exec(ua)) {
+					this.os.name = 'Aliyun OS';
+					this.os.version = new Version({ value: match[1], details: 3 })
+				}
+			}
+			
+
+
 			/****************************************************
 			 *		Google TV
 			 */

From 0d86a60753ead83fdd82e5e6b65a0cbf50a87b02 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Mon, 24 Sep 2012 13:07:22 +0200
Subject: [PATCH 030/174] Some Archos devices did not specify a correct Android
 version number, so detect version based on build instead

---
 scripts/useragents.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 2232bb26..3e53bd45 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -3000,7 +3000,16 @@ var UserAgents = (function(){
 				    if (! ua.match(/[a-zA-Z][a-zA-Z](?:[-_][a-zA-Z][a-zA-Z])?/)) {
 				    	this.device.model = match[1];
 					}
-				}		
+				}	
+				
+				if (this.os.version < 2) {
+					if (ua.match('Build/CUPCAKE')) this.os.version = new Version({ value: 1.5, details: 3 });
+					if (ua.match('Build/DONUT')) this.os.version = new Version({ value: 1.6, details: 3 });
+					if (ua.match('Build/ECLAIR')) this.os.version = new Version({ value: 2.0, details: 3 });
+					if (ua.match('Build/FROYO')) this.os.version = new Version({ value: 2.2, details: 3 });
+					if (ua.match('Build/GINGERBREAD')) this.os.version = new Version({ value: 2.3, details: 3 });
+				}
+					
 				
 				/* Sometimes we get a model name that starts with Android, in that case it is a mismatch and we should ignore it */
 				if (this.device.model && this.device.model.substring(0,7) == 'Android') {

From 6ea0a6f5e11a96eb3d6af6a5fbbff62771108dad Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Mon, 24 Sep 2012 13:18:26 +0200
Subject: [PATCH 031/174] More Android version detection

---
 scripts/useragents.js | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 3e53bd45..23068973 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -2968,10 +2968,23 @@ var UserAgents = (function(){
 					this.os.version = new Version({ value: match[1], details: 3 })
 				}
 
+				if (match = /Android [0-9][0-9].[0-9][0-9].[0-9][0-9]\(([^)]+)\);/.exec(ua.replace('-update', '.'))) {
+					this.os.version = new Version({ value: match[1], details: 3 })
+				}	
+				
 				if (ua.match('Android Eclair')) {
 					this.os.version = new Version({ value: '2.0', details: 3 });
 				}
 
+				if (this.os.version < 2) {
+					if (ua.match('Build/CUPCAKE')) this.os.version = new Version({ value: 1.5, details: 3 });
+					if (ua.match('Build/DONUT')) this.os.version = new Version({ value: 1.6, details: 3 });
+					if (ua.match('Build/ECLAIR')) this.os.version = new Version({ value: 2.0, details: 3 });
+					if (ua.match('Build/FROYO')) this.os.version = new Version({ value: 2.2, details: 3 });
+					if (ua.match('Build/GINGERBREAD')) this.os.version = new Version({ value: 2.3, details: 3 });
+				}
+					
+
 				this.device.type = 'mobile';
 				if (this.os.version >= 3) this.device.type = 'tablet';
 				if (this.os.version >= 4 && ua.match('Mobile')) this.device.type = 'mobile';
@@ -3001,15 +3014,7 @@ var UserAgents = (function(){
 				    	this.device.model = match[1];
 					}
 				}	
-				
-				if (this.os.version < 2) {
-					if (ua.match('Build/CUPCAKE')) this.os.version = new Version({ value: 1.5, details: 3 });
-					if (ua.match('Build/DONUT')) this.os.version = new Version({ value: 1.6, details: 3 });
-					if (ua.match('Build/ECLAIR')) this.os.version = new Version({ value: 2.0, details: 3 });
-					if (ua.match('Build/FROYO')) this.os.version = new Version({ value: 2.2, details: 3 });
-					if (ua.match('Build/GINGERBREAD')) this.os.version = new Version({ value: 2.3, details: 3 });
-				}
-					
+
 				
 				/* Sometimes we get a model name that starts with Android, in that case it is a mismatch and we should ignore it */
 				if (this.device.model && this.device.model.substring(0,7) == 'Android') {

From ab527ea5afc98d301eae205db13ec74be37ca4dc Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Mon, 24 Sep 2012 13:18:42 +0200
Subject: [PATCH 032/174] Add another way of detecting Baidu Browser

---
 scripts/useragents.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 23068973..79cfb8cf 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -4990,6 +4990,7 @@ var UserAgents = (function(){
 				{ name: 'Abrowser', 			regexp: /Abrowser\/([0-9.]*)/ },
 				{ name: 'arora', 				regexp: /[Aa]rora\/([0-9.]*)/ },
 				{ name: 'Baidu Browser', 		regexp: /M?BaiduBrowser\/([0-9.]*)/i },
+				{ name: 'Baidu Browser', 		regexp: /BdMobile\/([0-9.]*)/i },
 				{ name: 'Baidu Browser', 		regexp: /FlyFlow\/([0-9.]*)/, details: 2 },
 				{ name: 'Camino', 				regexp: /Camino\/([0-9.]*)/ },
 				{ name: 'Canure',				regexp: /Canure\/([0-9.]*)/, details: 3 },

From f4496b52ad6ad1c6463ef63d7a71b7920b6ad172 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Mon, 24 Sep 2012 13:28:07 +0200
Subject: [PATCH 033/174] Detect Dorothy browser

---
 scripts/useragents.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 79cfb8cf..4d4cad7b 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -5002,6 +5002,7 @@ var UserAgents = (function(){
 				{ name: 'Daedalus',				regexp: /Daedalus ([0-9.]*)/, details: 2 },
 				{ name: 'Demobrowser', 			regexp: /demobrowser\/([0-9.]*)/ },
 				{ name: 'Dooble', 				regexp: /Dooble(?:\/([0-9.]*))?/ },
+				{ name: 'Dorothy', 				regexp: /Dorothy$/ },
 				{ name: 'DWB', 					regexp: /dwb(?:-hg)?(?:\/([0-9.]*))?/ },
 				{ name: 'Epiphany', 			regexp: /Epiphany\/([0-9.]*)/ },
 				{ name: 'FireWeb', 				regexp: /FireWeb\/([0-9.]*)/ },

From 2200559cbd41c2de522f8187929d8844fb7ce26c Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Mon, 24 Sep 2012 13:28:29 +0200
Subject: [PATCH 034/174] Detect the BlackBerry Android runtime

---
 scripts/useragents.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 4d4cad7b..df93f627 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -324,6 +324,7 @@ var UserAgents = (function(){
 		/* Middleware and emulators */
 		'BlueStacks':								[ 'BlueStacks', 'App Player', 'desktop' ],
 		'youwave custom':							[ 'Youwave', 'Android on PC', 'desktop' ],
+		'BlackBerry Runtime for Android Apps':		[ 'RIM', 'BlackBerry (Android Runtime)', 'mobile' ],
 		
 		/* Regular devices */
 		'A100':										[ STRINGS_ACER, 'Iconia Tab A100', 'tablet' ],
@@ -3114,7 +3115,7 @@ var UserAgents = (function(){
 			 *		BlackBerry
 			 */
 		
-			if (ua.match('BlackBerry')) {
+			if (ua.match('BlackBerry') && !ua.match('BlackBerry Runtime for Android Apps')) {
 				this.os.name = 'BlackBerry OS';
 				
 				if (!ua.match('Opera')) {

From 83dcc68fcd51e9b3895ccaf76f5489c4808e9223 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Mon, 24 Sep 2012 13:38:44 +0200
Subject: [PATCH 035/174] Add support for detecting MaCross Mobile

---
 scripts/useragents.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index df93f627..3c38b37c 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -5025,6 +5025,7 @@ var UserAgents = (function(){
 				{ name: 'Lightning',			regexp: /Lightning\/([0-9.]*)/ },
 				{ name: 'Lunascape', 			regexp: /Lunascape[\/| ]([0-9.]*)/, details: 3 },
 				{ name: 'iLunascape', 			regexp: /iLunascape\/([0-9.]*)/, details: 3 },
+				{ name: 'MaCross Mobile',		regexp: /MaCross\/([0-9.]*)/ },
 				{ name: 'Maxthon', 				regexp: /Maxthon[\/ ]([0-9.]*)/, details: 3 },
 				{ name: 'MiniBrowser',			regexp: /MiniBr?owserM\/([0-9.]*)/ },
 				{ name: 'MiniBrowser',			regexp: /MiniBrowserMobile\/([0-9.]*)/ },

From 574e6c23947a284d5322d76945a347198c4c40e6 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Mon, 24 Sep 2012 13:39:04 +0200
Subject: [PATCH 036/174] More detail for the BlackBerry 10 version number

---
 scripts/useragents.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 3c38b37c..112a2521 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -3162,6 +3162,10 @@ var UserAgents = (function(){
 				this.device.model = 'BlackBerry ' + match[2];
 				this.device.type = ua.match('Mobile') ? 'mobile' : 'tablet';
 				this.device.identified = true;
+
+				if (match = /Version\/([0-9.]*)/.exec(ua)) {
+					this.os.version = new Version({ value: match[1], details: 2 });
+				}
 			}
 				
 			/****************************************************

From e6c986b58d95d9275f5cdebc07ba3bb89c4e4b0b Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Mon, 24 Sep 2012 14:23:41 +0200
Subject: [PATCH 037/174] More Aliyun OS detection

---
 scripts/useragents.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 112a2521..24b59bb6 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -3056,10 +3056,16 @@ var UserAgents = (function(){
 			 *		Aliyun OS
 			 */
 		
-			if (ua.match('AliyunOS')) {
+			if (ua.match('Aliyun')) {
+				this.device.type = 'mobile';
+
 				this.os.name = 'Aliyun OS';
 				this.os.version = null;
 
+				if (match = /YunOs ([0-9.]+)/.exec(ua)) {
+					this.os.version = new Version({ value: match[1], details: 3 })
+				}
+
 				if (match = /AliyunOS ([0-9.]+)/.exec(ua)) {
 					this.os.version = new Version({ value: match[1], details: 3 })
 				}
@@ -5176,6 +5182,10 @@ var UserAgents = (function(){
 				this.browser.hidden = true;
 			}
 
+			if (this.os.name == 'Aliyun OS' && this.browser.stock) {
+				this.browser.hidden = true;
+			}
+			
 			if (this.os.name == 'iOS' && this.browser.name == 'Opera Mini') {
 				this.os.version = null;
 			}	

From a814293f7a130c9ba145fafec9cdd6fc08f023d5 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Mon, 24 Sep 2012 14:25:52 +0200
Subject: [PATCH 038/174] Add device detection for Aliyun OS

---
 scripts/useragents.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 24b59bb6..052b861f 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -3069,6 +3069,21 @@ var UserAgents = (function(){
 				if (match = /AliyunOS ([0-9.]+)/.exec(ua)) {
 					this.os.version = new Version({ value: match[1], details: 3 })
 				}
+
+				if (match = /; ([^;]*[^;\s])\s+Build/.exec(ua)) {
+				    this.device.model = match[1];
+				}		
+
+				if (this.device.model) {
+					var model = cleanupModel(this.device.model);
+
+					if (typeof ANDROID_MODELS[model] != 'undefined') {
+						this.device.manufacturer = ANDROID_MODELS[model][0];
+						this.device.model = ANDROID_MODELS[model][1];
+						if (typeof ANDROID_MODELS[model][2] != 'undefined') this.device.type = ANDROID_MODELS[model][2];
+						this.device.identified = true;
+					}
+				}
 			}
 
 			if (ua.match('Android')) {

From ec895fb5ed0d24612e24e09fe6df5474f6aae7c2 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Mon, 24 Sep 2012 21:39:06 +0200
Subject: [PATCH 039/174] Many new phones and models

---
 scripts/useragents.js | 76 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 62 insertions(+), 14 deletions(-)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 052b861f..81694362 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -258,6 +258,8 @@ var UserAgents = (function(){
 		'mt5396':									[ 'Mediatek', 'MT5396' + STRINGS_BASED, 'television' ],
 		'bird75v2':									[ 'Mediatek', 'MT6575' + STRINGS_BASED ],
 		'eagle75v1 2':								[ 'Mediatek', 'MT6575' + STRINGS_BASED ],
+		'mt6575 phone':								[ 'Mediatek', 'MT6575' + STRINGS_BASED ],		
+		'mt8658':									[ 'Mediatek', 'MT8658' + STRINGS_BASED ],
 		'MBX DVBT reference board (c03ref)':		[ 'MXB', 'DVBT reference board', 'television' ],
 		'NS2816':									[ 'Nufront', 'NuSmart 2816' + STRINGS_BASED ],
 		'Ventana':									[ 'nVidia', 'Tegra Ventana development kit' ],
@@ -273,6 +275,7 @@ var UserAgents = (function(){
 		'msm7627a sku3':							[ STRINGS_QUALCOMM, 'Snapdragon S1' + STRINGS_BASED ],
 		'msm7630 fusion':							[ STRINGS_QUALCOMM, 'Snapdragon S2' + STRINGS_BASED ],
 		'msm7630 surf':								[ STRINGS_QUALCOMM, 'Snapdragon S2' + STRINGS_BASED ],
+		'msm8625':									[ STRINGS_QUALCOMM, 'Snapdragon S4' + STRINGS_BASED ],
 		'msm8660 cougar':							[ STRINGS_QUALCOMM, 'Snapdragon S3' + STRINGS_BASED ],
 		'msm8660 surf':								[ STRINGS_QUALCOMM, 'Snapdragon S3' + STRINGS_BASED ],
 		'msm8960':									[ STRINGS_QUALCOMM, 'Snapdragon S4' + STRINGS_BASED ],
@@ -330,11 +333,14 @@ var UserAgents = (function(){
 		'A100':										[ STRINGS_ACER, 'Iconia Tab A100', 'tablet' ],
 		'A101':										[ STRINGS_ACER, 'Iconia Tab A101', 'tablet' ],
 		'A200':										[ STRINGS_ACER, 'Iconia Tab A200', 'tablet' ],
+		'A211':										[ STRINGS_ACER, 'Iconia Tab A211', 'tablet' ],
 		'A500':										[ STRINGS_ACER, 'Iconia Tab A500', 'tablet' ],
 		'A501':										[ STRINGS_ACER, 'Iconia Tab A501', 'tablet' ],
 		'A510':										[ STRINGS_ACER, 'Iconia Tab A510', 'tablet' ],
 		'A511':										[ STRINGS_ACER, 'Iconia Tab A511', 'tablet' ],
 		'A700':										[ STRINGS_ACER, 'Iconia Tab A700', 'tablet' ],
+		'P2A700':									[ STRINGS_ACER, 'Iconia Tab A700', 'tablet' ],
+		'A701':										[ STRINGS_ACER, 'Iconia Tab A701', 'tablet' ],
 		'Acer A800':								[ STRINGS_ACER, 'Iconia Tab A800', 'tablet' ],
 		'E110':										[ STRINGS_ACER, 'beTouch E110' ],
 		'E120':										[ STRINGS_ACER, 'beTouch E120' ],
@@ -366,6 +372,7 @@ var UserAgents = (function(){
 		'Novo7 Advanced2':							[ 'Ainovo', 'Novo7 Advanced 2', 'tablet' ],
 		'Novo7 Basic':								[ 'Ainovo', 'Novo7 Basic', 'tablet' ],
 		'Novo7 ELF':								[ 'Ainovo', 'Novo7 Elf', 'tablet' ],
+		'Novo7 Fire':								[ 'Ainovo', 'Novo7 Fire', 'tablet' ],
 		'Novo7 PALADIN':							[ 'Ainovo', 'Novo7 Paladin', 'tablet' ],
 		'Novo8 Advanced':							[ 'Ainovo', 'Novo8 Advanced', 'tablet' ],
 		'one touch 890':							[ STRINGS_ALCATEL, 'One Touch 890' ],
@@ -414,16 +421,19 @@ var UserAgents = (function(){
 		'A35DE':									[ STRINGS_ARCHOS, '35 Smart Home Phone' ],
 		'A43':										[ STRINGS_ARCHOS, '43', 'media' ],
 		'Archos5':									[ STRINGS_ARCHOS, '5', 'media' ],
-		'A70H':										[ STRINGS_ARCHOS, '7', 'tablet' ],
-		'A70HB':									[ STRINGS_ARCHOS, '7', 'tablet' ],
-		'A70BHT':									[ STRINGS_ARCHOS, '7', 'tablet' ],
-		'A70CHT':									[ STRINGS_ARCHOS, '7C', 'tablet' ],
-		'A70S':										[ STRINGS_ARCHOS, '70', 'tablet' ],
-		'A7EB':										[ STRINGS_ARCHOS, '70B', 'tablet' ],
-		'ARCHOS 70it2':								[ STRINGS_ARCHOS, '70 IT 2', 'tablet' ],
-		'ARCHOS 80G9':								[ STRINGS_ARCHOS, '80 G9', 'tablet' ],
-		'ARCHOS 101G9':								[ STRINGS_ARCHOS, '101 G9', 'tablet' ],
-		'A101IT':									[ STRINGS_ARCHOS, '101 IT', 'tablet' ],
+		'A70H':										[ STRINGS_ARCHOS, '7 Home Tablet', 'tablet' ],					// G7
+		'A70HB':									[ STRINGS_ARCHOS, '7 Home Tablet', 'tablet' ],
+		'A70BHT':									[ STRINGS_ARCHOS, '7 Home Tablet', 'tablet' ],
+		'A70CHT':									[ STRINGS_ARCHOS, '7 Home Tablet', 'tablet' ],
+		'A70S':										[ STRINGS_ARCHOS, '70 Internet Tablet', 'tablet' ],				// G8
+		'A7EB':										[ STRINGS_ARCHOS, '70B Internet Tablet', 'tablet' ],
+		'ARCHOS 70it2':								[ STRINGS_ARCHOS, '70B Internet Tablet', 'tablet' ],		
+		'A101IT':									[ STRINGS_ARCHOS, '101 Internet Tablet', 'tablet' ],		
+		'ARCHOS 80G9':								[ STRINGS_ARCHOS, '80 G9', 'tablet' ],							// G9
+		'ARCHOS 101G9':								[ STRINGS_ARCHOS, '101 G9', 'tablet' ],						
+		'ARCHOS 97XSLG10':							[ STRINGS_ARCHOS, '97 XS', 'tablet' ],							// G10
+		'ARCHOS 101G10':							[ STRINGS_ARCHOS, '101 XS', 'tablet' ],
+		'ARCHOS 97 CARBON':							[ STRINGS_ARCHOS, '97 Carbon', 'tablet' ],						// Elements
 		'ASTRI':									[ 'ASTRI', 'e-reader', 'ereader' ],
 		'eeepc':									[ STRINGS_ASUS, 'Eee Pc' ],
 		'asus laptop':								[ STRINGS_ASUS, 'Eee Pc' ],
@@ -490,6 +500,7 @@ var UserAgents = (function(){
 		'MID7022':									[ 'Coby', 'Kyros MID7022', 'tablet' ],
 		'MID7024':									[ 'Coby', 'Kyros MID7024', 'tablet' ],
 		'MID7025':									[ 'Coby', 'Kyros MID7025', 'tablet' ],
+		'MID7035':									[ 'Coby', 'Kyros MID7035', 'tablet' ],
 		'MID7127':									[ 'Coby', 'Kyros MID7127', 'tablet' ],
 		'MID8024':									[ 'Coby', 'Kyros MID8024', 'tablet' ],
 		'MID8125':									[ 'Coby', 'Kyros MID8125', 'tablet' ],
@@ -522,7 +533,9 @@ var UserAgents = (function(){
 		'Coolpad 7005':								[ STRINGS_COOLPAD, '7005' ],
 		'7260':										[ STRINGS_COOLPAD, '7260' ],
 		'Coolpad 7260':								[ STRINGS_COOLPAD, '7260' ],
+		'Coolpad 7260A':							[ STRINGS_COOLPAD, '7260' ],
 		'Coolpad 8013':								[ STRINGS_COOLPAD, '8013' ],
+		'Coolpad 8026':								[ STRINGS_COOLPAD, '8026' ],
 		'Coolpad 8809':								[ STRINGS_COOLPAD, '8809' ],
 		'Coolpad 8810':								[ STRINGS_COOLPAD, '8810' ],
 		'8810':										[ STRINGS_COOLPAD, '8810' ],
@@ -603,7 +616,9 @@ var UserAgents = (function(){
 		'gemei G3':									[ 'Gemei', 'G3', 'tablet' ],
 		'Gemei G9':									[ 'Gemei', 'G9', 'tablet' ],
 		'GSmart G1317D':							[ 'Gigabyte', 'GSmart G1317D' ],
+		'GSmart G1342':								[ 'Gigabyte', 'GSmart G1342' ],
 		'Gigabyte TB100':							[ 'Gigabyte', 'TB100', 'tablet' ],
+		'GIO-GiONEE C500':							[ 'Gionee', 'C500' ],
 		'GN105':									[ 'Gionee', 'GN105' ],		
 		'GN200':									[ 'Gionee', 'GN200' ],		
 		'GN205':									[ 'Gionee', 'GN205' ],
@@ -616,6 +631,7 @@ var UserAgents = (function(){
 		'Nexus S 4G':								[ 'Google', 'Nexus S 4G' ],
 		'Dooderbutt-4.0.3-v1':						[ 'Google', 'Nexus S 4G' ],
 		'Nexus 7':									[ 'Google', 'Nexus 7', 'tablet' ],
+		'Google Nexus 7':							[ 'Google', 'Nexus 7', 'tablet' ],
 		'Haier HW-W910':							[ 'Haier', 'HW-W910' ],
 		'SN10T1':									[ 'HANNspree', 'HANNSpad SN10T1', 'tablet' ],
 		'SN10T2':									[ 'HANNspree', 'HANNSpad SN10T2', 'tablet' ],
@@ -627,7 +643,9 @@ var UserAgents = (function(){
 		'HS-U8':									[ 'Hisense', 'U8' ],
 		'HS-T92':									[ 'Hisense', 'T92' ],
 		'HS-E860':									[ 'Hisense', 'E860' ],
+		'E860':										[ 'Hisense', 'E860' ],
 		'HS-E910':									[ 'Hisense', 'E910' ],
+		'HS-E920':									[ 'Hisense', 'E920' ],
 		'HS-EG900':									[ 'Hisense', 'EG900' ],
 		'HS-ET919':									[ 'Hisense', 'ET919' ],
 		'EG968B':									[ 'Hisense', 'EG968B' ],
@@ -648,6 +666,7 @@ var UserAgents = (function(){
 		'HTC A6366':								[ STRINGS_HTC, 'Aria' ],
 		'HTC Bee':									[ STRINGS_HTC, 'Bee' ],
 		'HTC ChaCha':								[ STRINGS_HTC, 'ChaCha' ],
+		'HTC ChaCha A810':							[ STRINGS_HTC, 'ChaCha' ],
 		'HTC ChaCha A810e':							[ STRINGS_HTC, 'ChaCha' ],
 		'HTC ChaChaCha A810e':						[ STRINGS_HTC, 'ChaCha' ],
 		'HTC A810e':								[ STRINGS_HTC, 'ChaCha' ],
@@ -715,6 +734,7 @@ var UserAgents = (function(){
 		'HTC Design 4G':							[ STRINGS_HTC, 'EVO Design 4G' ],		/* Sprint */
 		'HTC EVO design 4G':						[ STRINGS_HTC, 'EVO Design 4G' ],
 		'HTC EVO Design 4G':						[ STRINGS_HTC, 'EVO Design 4G' ],
+		'HTCEVODesign4G':							[ STRINGS_HTC, 'EVO Design 4G' ],
 		'HTC Evo Shift':							[ STRINGS_HTC, 'EVO Shift' ],
 		'HTC EVO Shift 4G':							[ STRINGS_HTC, 'EVO Shift' ],
 		'HTC A310e':								[ STRINGS_HTC, 'Explorer' ],
@@ -978,7 +998,8 @@ var UserAgents = (function(){
 		'Huawei MediaPad':							[ STRINGS_HUAWEI, 'MediaPad', 'tablet' ],
 		'HUAWEI MediaPad':							[ STRINGS_HUAWEI, 'MediaPad', 'tablet' ],
 		'Huawei S7-312u':							[ STRINGS_HUAWEI, 'MediaPad', 'tablet' ],
-		'MediaPad 10 FHD':							[ STRINGS_HUAWEI, 'MediaPad', 'tablet' ],
+		'MediaPad 7 Lite':							[ STRINGS_HUAWEI, 'MediaPad 7 Lite', 'tablet' ],
+		'MediaPad 10 FHD':							[ STRINGS_HUAWEI, 'MediaPad 10', 'tablet' ],
 		'Huawei C8500':								[ STRINGS_HUAWEI, 'C8500' ],
 		'Huawei C8500S':							[ STRINGS_HUAWEI, 'C8500' ],
 		'Huawei C8600':								[ STRINGS_HUAWEI, 'C8600' ],
@@ -992,10 +1013,12 @@ var UserAgents = (function(){
 		'Huawei M835':								[ STRINGS_HUAWEI, 'M835' ],
 		'Huawei M860':								[ STRINGS_HUAWEI, 'Ascend' ],
 		'Huawei M921':								[ STRINGS_HUAWEI, 'M921' ],
+		'Huawei M931':								[ STRINGS_HUAWEI, 'M931' ],
 		'Huawei S8520':								[ STRINGS_HUAWEI, 'S8520' ],
 		'Huawei S8600':								[ STRINGS_HUAWEI, 'S8600' ],
 		'Huawei T8300':								[ STRINGS_HUAWEI, 'T8300' ],
 		'Huawei T8600':								[ STRINGS_HUAWEI, 'T8600' ],
+		'Huawei T8950':								[ STRINGS_HUAWEI, 'Honor+' ],
 		'Huawei U8220':								[ STRINGS_HUAWEI, 'U8220' ],
 		'Huawei u8500':								[ STRINGS_HUAWEI, 'IDEOS X2' ],
 		'Huawei U8815':								[ STRINGS_HUAWEI, 'Ascend G300' ],
@@ -1004,6 +1027,7 @@ var UserAgents = (function(){
 		'Huawei U8661':								[ STRINGS_HUAWEI, 'Sonic+' ],
 		'Huawei U8800-51':							[ STRINGS_HUAWEI, 'IDEOS X5' ],
 		'Huawei U8818':								[ STRINGS_HUAWEI, 'Ascend G300' ],
+		'Huawei U8825D':							[ STRINGS_HUAWEI, 'Ascend G330D' ],
 		'Huawei U9000':								[ STRINGS_HUAWEI, 'Ascend X' ],
 		'Huawei IDEOS U8500':						[ STRINGS_HUAWEI, 'IDEOS X2' ],
 		'Huawei IDEOS U8650':						[ STRINGS_HUAWEI, 'Sonic' ],
@@ -1083,6 +1107,7 @@ var UserAgents = (function(){
 		'U9000':									[ STRINGS_HUAWEI, 'Ascend X' ],
 		'U9200':									[ STRINGS_HUAWEI, 'Ascend P1' ],
 		'U9200-1':									[ STRINGS_HUAWEI, 'Ascend P1' ],
+		'U9200E':									[ STRINGS_HUAWEI, 'Ascend P1' ],
 		'U9500':									[ STRINGS_HUAWEI, 'Ascend D1' ],
 		'U9501L':									[ STRINGS_HUAWEI, 'Ascend D LTE' ],
 		'U9510':									[ STRINGS_HUAWEI, 'Ascend D quad' ],
@@ -1162,6 +1187,7 @@ var UserAgents = (function(){
 		'Lenovo S2-38AH0':							[ STRINGS_LENOVO, 'LePhone S2-38AH0' ],
 		'Lenovo S2-38AT0':							[ STRINGS_LENOVO, 'LePhone S2-38AT0' ],
 		'Lenovo A288t':								[ STRINGS_LENOVO, 'LePhone A288' ],
+		'Lenovo A300':								[ STRINGS_LENOVO, 'LePhone A300' ],
 		'Lenovo A366t':								[ STRINGS_LENOVO, 'LePhone A366' ],
 		'Lenovo A390e':								[ STRINGS_LENOVO, 'LePhone A390' ],
 		'Lenovo A500':								[ STRINGS_LENOVO, 'LePhone A500' ],
@@ -1176,6 +1202,7 @@ var UserAgents = (function(){
 		'Lenovo K860':								[ STRINGS_LENOVO, 'LePhone K860' ],
 		'Lenovo P70':								[ STRINGS_LENOVO, 'LePhone P70' ],
 		'Lenovo P700':								[ STRINGS_LENOVO, 'LePhone P700' ],
+		'Lenovo S560':								[ STRINGS_LENOVO, 'S560' ],
 		'Lenovo S850e':								[ STRINGS_LENOVO, 'S850' ],
 		'Lenovo S880':								[ STRINGS_LENOVO, 'S880' ],
 		'A30t':										[ STRINGS_LENOVO, 'A30t' ],
@@ -1197,6 +1224,7 @@ var UserAgents = (function(){
 		'LG-CX670':									[ STRINGS_LG, 'Optimus 3G' ],
 		'LG-E400':									[ STRINGS_LG, 'Optimus L3' ],
 		'LG-E400f':									[ STRINGS_LG, 'Optimus L3' ],
+		'LG-E405':									[ STRINGS_LG, 'Optimus L3 Dual' ],
 		'LG-E405f':									[ STRINGS_LG, 'Optimus L3 Dual' ],
 		'LG-E510':									[ STRINGS_LG, 'Optimus Hub' ],
 		'LG-E510f':									[ STRINGS_LG, 'Optimus Hub' ],
@@ -1390,6 +1418,7 @@ var UserAgents = (function(){
 		'Slidepad':									[ 'Memup', 'Slidepad', 'tablet' ],
 		'A45':										[ 'Micromax', 'A45 Punk' ],
 		'Micromax A50':								[ 'Micromax', 'A50 Ninja' ],
+		'Micromax A57':								[ 'Micromax', 'A57 Ninja 3' ],
 		'Micromax A60':								[ 'Micromax', 'Andro A60' ],
 		'Micromax A70':								[ 'Micromax', 'Andro A70' ],
 		'P300(Funbook)':							[ 'Micromax', 'Funbook P300', 'tablet' ],
@@ -1470,6 +1499,7 @@ var UserAgents = (function(){
 		'XT550':									[ STRINGS_MOTOROLA, 'XT550' ],	
 		'XT556':									[ STRINGS_MOTOROLA, 'XT556' ],	
 		'XT603':									[ STRINGS_MOTOROLA, 'ADMIRAL' ],
+		'XT605':									[ STRINGS_MOTOROLA, 'XT605' ],	
 		'XT610':									[ STRINGS_MOTOROLA, 'Droid Pro' ],
 		'XT615':									[ STRINGS_MOTOROLA, 'MOTO XT615' ],
 		'XT626':									[ STRINGS_MOTOROLA, 'MOTO XT626' ],
@@ -1481,6 +1511,7 @@ var UserAgents = (function(){
 		'XT702':									[ STRINGS_MOTOROLA, 'MOTO XT702' ],
 		'XT711':									[ STRINGS_MOTOROLA, 'MOTO XT711' ],
 		'XT720':									[ STRINGS_MOTOROLA, 'Milestone' ],
+		'XT788':									[ STRINGS_MOTOROLA, 'XT788' ],
 		'XT875':									[ STRINGS_MOTOROLA, 'Droid Bionic' ],
 		'XT800':									[ STRINGS_MOTOROLA, 'MOTO XT800' ],
 		'XT800+':									[ STRINGS_MOTOROLA, 'MOTO XT800' ],
@@ -1490,6 +1521,7 @@ var UserAgents = (function(){
 		'XT862':									[ STRINGS_MOTOROLA, 'Droid 3' ],
 		'XT882':									[ STRINGS_MOTOROLA, 'MOTO XT882' ],
 		'XT883':									[ STRINGS_MOTOROLA, 'Milestone 3' ],
+		'XT885':									[ STRINGS_MOTOROLA, 'RAZR V' ],
 		'XT889':									[ STRINGS_MOTOROLA, 'XT889' ],
 		'XT897':									[ STRINGS_MOTOROLA, 'Droid 4' ],
 		'XT901':									[ STRINGS_MOTOROLA, 'RAZR' ],
@@ -1595,6 +1627,7 @@ var UserAgents = (function(){
 		'Lumia800':									[ 'Nokia', 'Lumia 800' ],
 		'Lumia 900':								[ 'Nokia', 'Lumia 900' ],
 		'Notion Ink ADAM':							[ 'Notion Ink', 'ADAM', 'tablet' ],
+		'Adam':										[ 'Notion Ink', 'ADAM', 'tablet' ],
 		'P4D SIRIUS':								[ 'Nvsbl', 'P4D SIRIUS', 'tablet' ],
 		'P4D Sirius':								[ 'Nvsbl', 'P4D SIRIUS', 'tablet' ],
 		'EFM710A':									[ 'Oblio', 'Mint 7x', 'tablet' ],
@@ -1611,10 +1644,14 @@ var UserAgents = (function(){
 		'X903':										[ 'Oppo', 'Find Me X903' ],
 		'X905':										[ 'Oppo', 'Find 3 X905' ],
 		'OPPOX905':									[ 'Oppo', 'Find 3 X905' ],
+		'OPPOX907':									[ 'Oppo', 'Finder X907' ],
 		'X9015':									[ 'Oppo', 'Find X9015' ],
 		'OPPOX9017':								[ 'Oppo', 'Finder X9017' ],
+		'OPPOR801':									[ 'Oppo', 'Real R801' ],
+		'OPPOR805':									[ 'Oppo', 'Real R805' ],
 		'OPPOR807':									[ 'Oppo', 'Real R807' ],
 		'OPPOT703':									[ 'Oppo', 'T703' ],
+		'OPPOU7011':								[ 'Oppo', 'Find Gemini U7011' ],
 		'P-01D':									[ 'Panasonic', 'P-01D' ],
 		'P-02D':									[ 'Panasonic', 'Lumix Phone' ],
 		'P-04D':									[ 'Panasonic', 'Eluga' ],
@@ -1658,9 +1695,10 @@ var UserAgents = (function(){
 		'ADR910L 4G':								[ STRINGS_PANTECH, 'ADR910L' ],
 		'PantechP4100':								[ STRINGS_PANTECH, 'Element', 'tablet' ],
 		'PantechP8000':								[ STRINGS_PANTECH, 'Crossover' ],
-		'PantechP8010':								[ STRINGS_PANTECH, 'P8010' ],
+		'PantechP8010':								[ STRINGS_PANTECH, 'Flex' ],
 		'PantechP9060':								[ STRINGS_PANTECH, 'Pocket' ],
 		'PantechP9070':								[ STRINGS_PANTECH, 'Burst' ],
+		'PantechP9090':								[ STRINGS_PANTECH, 'Magnus' ],
 		'SKY IM-A600S':								[ STRINGS_PANTECH, 'SIRIUS α' ],
 		'SKY IM-A630K':								[ STRINGS_PANTECH, 'SKY Izar' ],
 		'SKY IM-A650S':								[ STRINGS_PANTECH, 'SKY Vega' ],
@@ -1673,6 +1711,7 @@ var UserAgents = (function(){
 		'Philips W626':								[ 'Philips', 'W626' ],
 		'Philips W632':								[ 'Philips', 'W632' ],
 		'MOMO':										[ 'Ployer', 'MOMO', 'tablet' ],
+		'MOMO8':									[ 'Ployer', 'MOMO8', 'tablet' ],
 		'MOMO15':									[ 'Ployer', 'MOMO15', 'tablet' ],
 		'PocketBook A7':							[ 'PocketBook', 'A7', 'tablet' ],
 		'PocketBook A10':							[ 'PocketBook', 'A10', 'tablet' ],
@@ -1993,6 +2032,7 @@ var UserAgents = (function(){
 		'SPH-D700':									[ STRINGS_SAMSUNG, 'Epic 4G' ],
 		'SPH-D705':									[ STRINGS_SAMSUNG, 'Epic 4G 2' ],
 		'SPH-D710':									[ STRINGS_SAMSUNG, 'Epic 4G Touch' ],
+		'SPH-D710BST':								[ STRINGS_SAMSUNG, 'Epic 4G Touch' ],
 		'SPH-L700':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
 		'SPH-L710':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
 		'SPH-M820':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Prevail' ],
@@ -2097,6 +2137,7 @@ var UserAgents = (function(){
 		'LT15i':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc' ],
 		'LT15iv':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc' ],
 		'LT15i-o':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc' ],
+		'LT18':										[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc S' ],
 		'LT18a':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc S' ],
 		'LT18i':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc S' ],
 		'LT18iv':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc S' ],
@@ -2104,6 +2145,7 @@ var UserAgents = (function(){
 		'LT22i':									[ 'Sony', STRINGS_XPERIA + ' P' ],
 		'LT26i':									[ 'Sony', STRINGS_XPERIA + ' S' ],
 		'LT26i-o':									[ 'Sony', STRINGS_XPERIA + ' S' ],
+		'LT26ii':									[ 'Sony', STRINGS_XPERIA + ' SL' ],
 		'LT26w':									[ 'Sony', STRINGS_XPERIA + ' Acro S' ],
 		'LT28at':									[ 'Sony', STRINGS_XPERIA + ' Ion' ],
 		'LT28h':									[ 'Sony', STRINGS_XPERIA + ' Ion' ],
@@ -2143,10 +2185,10 @@ var UserAgents = (function(){
 		'ST18av':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Ray' ],
 		'SonyST21':									[ 'Sony', STRINGS_XPERIA + ' Tipo' ],
 		'SonyST21i':								[ 'Sony', STRINGS_XPERIA + ' Tipo' ],
-		'SonyST21a2':								[ 'Sony', STRINGS_XPERIA + ' Tipo' ],
-		'SonyST21i2':								[ 'Sony', STRINGS_XPERIA + ' Tipo' ],
 		'ST21':										[ 'Sony', STRINGS_XPERIA + ' Tipo' ],
 		'ST21i':									[ 'Sony', STRINGS_XPERIA + ' Tipo' ],
+		'SonyST21a2':								[ 'Sony', STRINGS_XPERIA + ' Tipo Dual' ],
+		'SonyST21i2':								[ 'Sony', STRINGS_XPERIA + ' Tipo Dual' ],
 		'SonyST23i':								[ 'Sony', STRINGS_XPERIA + ' Miro' ],
 		'ST23i':									[ 'Sony', STRINGS_XPERIA + ' Miro' ],
 		'ST25i':									[ 'Sony', STRINGS_XPERIA + ' U' ],
@@ -2181,6 +2223,7 @@ var UserAgents = (function(){
 		'SO-03D':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Acro HD' ],
 		'SO-04D':									[ 'Sony', STRINGS_XPERIA + ' GX' ],
 		'SO-05D':									[ 'Sony', STRINGS_XPERIA + ' SX' ],
+		'SonySO-05D':								[ 'Sony', STRINGS_XPERIA + ' SX' ],
 		'XPERIA X8':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X8' ],
 		'Xperia X8':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X8' ],
 		'Xperia X10':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10' ],
@@ -2227,6 +2270,7 @@ var UserAgents = (function(){
 		'P76TI':									[ 'Teclast', 'P76Ti', 'tablet' ],
 		'P81HD':									[ 'Teclast', 'P81HD', 'tablet' ],
 		'P85(R8A1)':								[ 'Teclast', 'P85', 'tablet' ],
+		'Teclast P85':								[ 'Teclast', 'P85', 'tablet' ],
 		'T720 SE':									[ 'Teclast', 'T720', 'tablet' ],
 		'T760 from moage.com':						[ 'Teclast', 'T760', 'tablet' ],
 		'tegav2':									[ 'Tegatech', 'TEGA v2', 'tablet' ],
@@ -2282,6 +2326,7 @@ var UserAgents = (function(){
 		'N70 DUAL CORE':							[ 'Window', 'N70 Dual Core', 'tablet' ],
 		'N80':										[ 'Window', 'N80', 'tablet' ],
 		'N90':										[ 'Window', 'N90', 'tablet' ],
+		'N90 DUAL CORE2':							[ 'Window', 'N90 Dual Core', 'tablet' ],
 		'N90 DUAL CORE2 V12':						[ 'Window', 'N90 Dual Core', 'tablet' ],
 		'N612':										[ 'Wishway', 'N612' ],
 		'AT-AS43D':									[ 'Wolfgang', 'AT-AS43D' ],
@@ -2389,6 +2434,7 @@ var UserAgents = (function(){
 		'ZTE V889D':								[ STRINGS_ZTE, 'V889' ],
 		'ZTE V970':									[ STRINGS_ZTE, 'Z970' ],
 		'ZTE-Z990':									[ STRINGS_ZTE, 'Z990' ],
+		'ZTE-Z990G':								[ STRINGS_ZTE, 'Z990' ],
 		'003Z':										[ STRINGS_ZTE, 'Softbank 003Z' ],
 		'008Z':										[ STRINGS_ZTE, 'Softbank 008Z' ],
 		'009Z':										[ STRINGS_ZTE, 'Softbank Star7' ],
@@ -2398,6 +2444,8 @@ var UserAgents = (function(){
 		'i-mobile i695':							[ 'i-Mobile', 'i695' ],
 		'i-mobile i858':							[ 'i-Mobile', 'i858' ],
 		'i-mobile 3G 8500':							[ 'i-Mobile', '3G 8500' ],
+		'i-mobile i-style Q1':						[ 'i-Mobile', 'i-Style Q1' ],						
+		'i-mobile i-STYLE Q2':						[ 'i-Mobile', 'i-Style Q2' ],						
 		'i-mobile I-Note':							[ 'i-Mobile', 'i-Note', 'tablet' ],
 
 		'Optimus Boston':							[ 'Optimus', 'Boston' ],							/* Gigabyte GSmart G1305 */

From 03ec31bc8e53ce3bc23dcdf215c3767d5d7d39d3 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 26 Sep 2012 00:13:44 +0200
Subject: [PATCH 040/174] Update blacklists, remove Maxthon from most, add
 Sogou Explorer

---
 scripts/engine.js | 41 +++++++++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/scripts/engine.js b/scripts/engine.js
index 4a817696..d1e117ef 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -14,12 +14,17 @@ Test = (function() {
 		initialize: function(c) {
 			blacklists = {
 				fileField: 			Browsers.isOs('iOS', '<', '6'), 
-				dateFields:			Browsers.isBrowser('Maxthon') || Browsers.isBrowser('UC Browser'),
-				colorField:			Browsers.isBrowser('Maxthon') || Browsers.isBrowser('UC Browser'),
+				dateFields:			Browsers.isBrowser('Sogou Explorer') || Browsers.isBrowser('Maxthon') || Browsers.isBrowser('UC Browser'),
+				colorField:			Browsers.isBrowser('Sogou Explorer') || Browsers.isBrowser('UC Browser'),
 				rangeField:			Browsers.isBrowser('UC Browser'),
-				subtitle:			Browsers.isBrowser('Maxthon'),
-				getUserMedia:		Browsers.isBrowser('Maxthon') || Browsers.isBrowser('UC Browser') || Browsers.isBrowser('Dolphin'),
-				webgl:				Browsers.isBrowser('Maxthon'),
+				numberField:		false,
+				progressField:		false,
+				meterField:			false,
+				subtitle:			Browsers.isBrowser('Sogou Explorer'),
+				notifications:		Browsers.isBrowser('Sogou Explorer'),
+				fullScreen:			Browsers.isBrowser('Sogou Explorer'),
+				getUserMedia:		Browsers.isBrowser('Sogou Explorer') || Browsers.isBrowser('UC Browser') || Browsers.isBrowser('Dolphin'),
+				webgl:				false,
 			};		
 			
 			whitelists = {
@@ -1413,11 +1418,19 @@ Test = (function() {
 					required:	true
 				});
 				
-				group.setItem({
-					id:			'ui',
-					passed:		(t != 'range' || !blacklists.rangeField) && minimal && (baseline.field != getRenderedStyle(element.field) || baseline.wrapper != getRenderedStyle(element.wrapper)),
-					value: 		2
-				});
+				if (t == 'range') {
+					group.setItem({
+						id:			'ui',
+						passed:		!blacklists.rangeField && minimal && (baseline.field != getRenderedStyle(element.field) || baseline.wrapper != getRenderedStyle(element.wrapper)),
+						value: 		2
+					});
+				} else {
+					group.setItem({
+						id:			'ui',
+						passed:		!blacklists.numberField && minimal && (baseline.field != getRenderedStyle(element.field) || baseline.wrapper != getRenderedStyle(element.wrapper)),
+						value: 		2
+					});
+				}
 				
 				group.setItem({
 					id:			'sanitization',
@@ -1740,7 +1753,7 @@ Test = (function() {
 			var element = document.createElement('progress');
 			group.setItem({
 				id:			'element',
-				passed:		typeof HTMLProgressElement != 'undefined' && element instanceof HTMLProgressElement, 
+				passed:		!blacklists.progressField && typeof HTMLProgressElement != 'undefined' && element instanceof HTMLProgressElement, 
 				value: 		2
 			});
 			
@@ -1754,7 +1767,7 @@ Test = (function() {
 			var element = document.createElement('meter');
 			group.setItem({
 				id:			'element',
-				passed:		typeof HTMLMeterElement != 'undefined' && element instanceof HTMLMeterElement, 
+				passed:		!blacklists.meterField && typeof HTMLMeterElement != 'undefined' && element instanceof HTMLMeterElement, 
 				value: 		2
 			});
 
@@ -2804,7 +2817,7 @@ Test = (function() {
 			
 			this.section.setItem({
 				id:			'notifications',
-				passed:		this.hasNotification(), 
+				passed:		!blacklists.notifications && this.hasNotification(), 
 				value: 		10
 			});
 		},
@@ -2877,7 +2890,7 @@ Test = (function() {
 			
 			this.section.setItem({
 				id:			'requestFullScreen',
-				passed:		!! document.documentElement.requestFullscreen || !! document.documentElement.webkitRequestFullScreen || !! document.documentElement.mozRequestFullScreen || !! document.documentElement.msRequestFullScreen, 
+				passed:		!blacklists.subtitle && (!! document.documentElement.requestFullscreen || !! document.documentElement.webkitRequestFullScreen || !! document.documentElement.mozRequestFullScreen || !! document.documentElement.msRequestFullScreen), 
 				value: 		4
 			});
 			

From 3d4e9e8313f054449d1d4a0a6a6d64a00f654e15 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 26 Sep 2012 00:13:58 +0200
Subject: [PATCH 041/174] Add support for Chrome 22

---
 scripts/useragents.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 81694362..a904788c 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -4592,6 +4592,7 @@ var UserAgents = (function(){
 						case '19.0.1084':
 						case '20.0.1132':
 						case '21.0.1180':
+						case '22.0.1229':
 							if (this.browser.version.minor == 0) 
 								this.browser.version.details = 1;
 							else

From b5664f124d37e8287aaf122ab07a14cfc66d9c28 Mon Sep 17 00:00:00 2001
From: Syoichi Tsuyuhara <syoichi@outlook.com>
Date: Sat, 29 Sep 2012 20:10:10 +0900
Subject: [PATCH 042/174] Fix a vendor prefix of webkitMutationObserver and
 mozMutationObserver

---
 scripts/engine.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/engine.js b/scripts/engine.js
index d1e117ef..af070538 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -2856,7 +2856,7 @@ Test = (function() {
 			
 			this.section.setItem({
 				id:   		'mutationObserver',
-				passed:   	'MutationObserver' in window || 'webkitMutationObserver' in window || 'mozMutationObserver' in window || 'oMutationObserver' in window || 'msMutationObserver' in window,
+				passed:   	'MutationObserver' in window || 'WebKitMutationObserver' in window || 'MozMutationObserver' in window || 'oMutationObserver' in window || 'msMutationObserver' in window,
 				value:  	3 
 			});
 		}

From ad8d7c98d8879ecf51b5e9f75245cf7146d9d1a4 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Oct 2012 19:00:50 +0200
Subject: [PATCH 043/174] Instead of looking at browsers for the whitelist,
 look at rendering engines

---
 scripts/engine.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/engine.js b/scripts/engine.js
index af070538..891ce783 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -38,9 +38,9 @@ Test = (function() {
 										Browsers.isOs('BlackBerry Tablet OS') || 
 										Browsers.isOs('Meego') || 
 										Browsers.isOs('Tizen') || 
+										Browsers.isEngine('Gecko') ||
+										Browsers.isEngine('Presto') || 
 										Browsers.isBrowser('Chrome') ||
-										Browsers.isBrowser('Firefox') ||
-										Browsers.isBrowser('Opera') || 
 										Browsers.isBrowser('Polaris', '>=', '8')
 									) ||
 									Browsers.isType('television') && (

From 8b72ac2116c16b240da6f6363156e19fd0975e58 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Oct 2012 22:35:59 +0200
Subject: [PATCH 044/174] Date fields seems to be working on UC Browser 8.6 or
 higher

---
 scripts/engine.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/engine.js b/scripts/engine.js
index 891ce783..b4cd04fa 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -14,7 +14,7 @@ Test = (function() {
 		initialize: function(c) {
 			blacklists = {
 				fileField: 			Browsers.isOs('iOS', '<', '6'), 
-				dateFields:			Browsers.isBrowser('Sogou Explorer') || Browsers.isBrowser('Maxthon') || Browsers.isBrowser('UC Browser'),
+				dateFields:			Browsers.isBrowser('Sogou Explorer') || Browsers.isBrowser('Maxthon') || Browsers.isBrowser('UC Browser', '<', '8.6'),
 				colorField:			Browsers.isBrowser('Sogou Explorer') || Browsers.isBrowser('UC Browser'),
 				rangeField:			Browsers.isBrowser('UC Browser'),
 				numberField:		false,

From 20d2a1e560f9009eb08c9b68abc7b980eebb15da Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Oct 2012 22:52:43 +0200
Subject: [PATCH 045/174] Detect Windows RT

---
 scripts/useragents.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index a904788c..63a2e405 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -2899,6 +2899,10 @@ var UserAgents = (function(){
 					}
 				}
 				
+				if (ua.match('Windows NT 6.2') && ua.match('; ARM;')) {
+					this.os.version = new Version({ value: match[1], alias: 'RT' });
+				}
+				
 				if (ua.match('Windows 95') || ua.match('Win95') || ua.match('Win 9x 4.00')) {
 					this.os.version = new Version({ value: '4.0', alias: '95' });
 				}

From 1e2560947fdfbdfb64e5932dc5849dbcb8f36015 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Thu, 4 Oct 2012 14:47:12 +0200
Subject: [PATCH 046/174] Detect Internet Explorer for Xbox

---
 scripts/useragents.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 63a2e405..abaa818e 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -3764,6 +3764,25 @@ var UserAgents = (function(){
 				this.device.identified = true;
 			}
 
+
+			/****************************************************
+			 *		XBox
+			 *
+			 *		Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0; Xbox)
+			 */
+		
+			if (ua.match(/Xbox\)$/)) {
+				this.os.name = '';
+				this.os.version = null;
+
+				this.device.manufacturer = 'Microsoft';
+				this.device.model = 'Xbox 360';
+				this.device.type = 'gaming';
+				this.device.identified = true;
+			}
+
+
+
 			/****************************************************
 			 *		Panasonic Smart Viera
 			 *

From 4e178f06dbae6aca99b1c5bc7857fd71b803f1a4 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Thu, 4 Oct 2012 14:47:43 +0200
Subject: [PATCH 047/174] Detect Windows Phone 8 in an emulator

---
 scripts/useragents.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index abaa818e..e924eb0f 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -2919,6 +2919,12 @@ var UserAgents = (function(){
 					this.os.name = new Version({ value: '5.1', alias: 'XP' });
 				}
 
+				if (ua.match('Windows NT 6.2') && ua.match('; ARM;')) {
+					this.os.name = 'Windows Phone';
+					this.os.version = new Version({ value: '8', details: 1 });
+					this.device.type = 'mobile';
+				}
+				
 				if (ua.match('WP7')) {
 					this.os.name = 'Windows Phone';
 					this.os.version = new Version({ value: '7.0', details: 2 });

From 2e63d8bb4205637ea7ea9081ff6ee56dc5300a85 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Thu, 4 Oct 2012 14:48:07 +0200
Subject: [PATCH 048/174] Remove faulty Windows RT detection

---
 scripts/useragents.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index e924eb0f..447a356e 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -2899,10 +2899,6 @@ var UserAgents = (function(){
 					}
 				}
 				
-				if (ua.match('Windows NT 6.2') && ua.match('; ARM;')) {
-					this.os.version = new Version({ value: match[1], alias: 'RT' });
-				}
-				
 				if (ua.match('Windows 95') || ua.match('Win95') || ua.match('Win 9x 4.00')) {
 					this.os.version = new Version({ value: '4.0', alias: '95' });
 				}

From 64b78c0d57c7759be1c9077f4ca33762886919d8 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Thu, 4 Oct 2012 14:48:31 +0200
Subject: [PATCH 049/174] Detect Nintendo Wii U

---
 scripts/useragents.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 447a356e..1aeace22 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -3675,6 +3675,7 @@ var UserAgents = (function(){
 			 *		Opera/9.50 (Nintendo DSi; Opera/507; U; en-US)
 			 *		Mozilla/5.0 (Nintendo 3DS; U; ; en) Version/1.7455.US
 			 *		Mozilla/5.0 (Nintendo 3DS; U; ; en) Version/1.7455.EU
+			 *		Mozilla/5.0 (Nintendo WiiU) AppleWebKit/534.52 (KHTML, like Gecko) NX/2.1.0.8.8 Version/1.0.0.6760.JP
 			 */
 		
 			if (ua.match('Nintendo Wii')) {
@@ -3686,6 +3687,15 @@ var UserAgents = (function(){
 				this.device.identified = true;
 			}
 			
+			if (ua.match('Nintendo WiiU')) {
+				this.os.name = '';
+
+				this.device.manufacturer = 'Nintendo';
+				this.device.model = 'Wii U';
+				this.device.type = 'gaming';
+				this.device.identified = true;
+			}
+			
 			if (ua.match('Nintendo DSi')) {
 				this.os.name = '';
 

From 6afe85e0fe1a63b769b2800e1ad13d356150e03f Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Thu, 4 Oct 2012 14:48:47 +0200
Subject: [PATCH 050/174] Improve Dolphin detection

---
 scripts/useragents.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 1aeace22..72a23621 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -4984,7 +4984,7 @@ var UserAgents = (function(){
 				}
 			}	
 
-			if (match = /Dolphin\/INT/.exec(ua)) {
+			if (match = /Dolphin\/(?:INT|CN)/.exec(ua)) {
 				this.browser.name = 'Dolphin';
 				this.device.type = 'mobile';
 			}	

From fe33e41568a9a8a4270913fbbcc93900fad08a03 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Thu, 4 Oct 2012 14:49:06 +0200
Subject: [PATCH 051/174] Improve MachBlue XT detection

---
 scripts/useragents.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 72a23621..fe7c3757 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -3953,6 +3953,12 @@ var UserAgents = (function(){
 				this.device.type = 'television';
 			}
 
+			if (ua == 'MachBlue') {
+				this.os.name = '';
+				this.browser.name = 'MachBlue XT'
+				this.device.type = 'television';
+			}
+
 			/****************************************************
 			 *		ADB
 			 */

From 1b81be0684ac6e31a83c5d064ce1acb79c6d7271 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Thu, 4 Oct 2012 14:49:21 +0200
Subject: [PATCH 052/174] Improve Midori detection

---
 scripts/useragents.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index fe7c3757..d7cf4dc0 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -5070,6 +5070,11 @@ var UserAgents = (function(){
 				this.device.model = null;
 				this.device.type = 'desktop';
 			}	
+
+			if (match = /midori$/.exec(ua)) {
+				this.browser.name = 'Midori';
+			}
+			
 			
 			/****************************************************
 			 *		Others

From f7264d67822603d24cfa018fed80d3c728e38fde Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Thu, 4 Oct 2012 14:49:45 +0200
Subject: [PATCH 053/174] Add new browsers and phone models

---
 scripts/useragents.js | 38 +++++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index d7cf4dc0..d97a6985 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -193,11 +193,16 @@ var UserAgents = (function(){
 			'800C':									[ 'Nokia', 'Lumia 800' ]
 		},
 		
+		'Nokia': {
+			'Lumia 710':							[ 'Nokia', 'Lumia 710' ]
+		},
+		
 		'NOKIA': {
 			'710':									[ 'Nokia', 'Lumia 710' ],
 			'Nokia 710':							[ 'Nokia', 'Lumia 710' ],
 			'Lumia 710':							[ 'Nokia', 'Lumia 710' ],
 			'Lumia 719':							[ 'Nokia', 'Lumia 719' ],
+			'Nokia 800C':							[ 'Nokia', 'Lumia 800' ],
 			'Lumia 800':							[ 'Nokia', 'Lumia 800' ],
 			'800':									[ 'Nokia', 'Lumia 800' ],
 			'Lumia 900':							[ 'Nokia', 'Lumia 900' ],
@@ -279,6 +284,7 @@ var UserAgents = (function(){
 		'msm8660 cougar':							[ STRINGS_QUALCOMM, 'Snapdragon S3' + STRINGS_BASED ],
 		'msm8660 surf':								[ STRINGS_QUALCOMM, 'Snapdragon S3' + STRINGS_BASED ],
 		'msm8960':									[ STRINGS_QUALCOMM, 'Snapdragon S4' + STRINGS_BASED ],
+		'msm8974':									[ STRINGS_QUALCOMM, 'Snapdragon' + STRINGS_BASED ],
 		'rk2808sdk':								[ 'Rockchip', 'RK2808' + STRINGS_BASED ],
 		'RK2818':									[ 'Rockchip', 'RK2818' + STRINGS_BASED ],
 		'rk2818sdk':								[ 'Rockchip', 'RK2818' + STRINGS_BASED ],
@@ -450,6 +456,7 @@ var UserAgents = (function(){
 		'ASUS Transformer TF300T':					[ STRINGS_ASUS, 'Transformer Pad 300', 'tablet' ],
 		'ASUS Transformer Pad TF300T':				[ STRINGS_ASUS, 'Transformer Pad 300', 'tablet' ],
 		'ASUS Transformer Pad TF300TG':				[ STRINGS_ASUS, 'Transformer Pad 300', 'tablet' ],
+		'ASUS Transformer Pad TF300TL':				[ STRINGS_ASUS, 'Transformer Pad 300', 'tablet' ],
 		'ASUS Transformer Pad TF700T':				[ STRINGS_ASUS, 'Transformer Pad Infinity 700', 'tablet' ],
 		'ASUS Transformer Pad TF700K':				[ STRINGS_ASUS, 'Transformer Pad Infinity 700', 'tablet' ],
 		'ASUS Transformer TF700K':					[ STRINGS_ASUS, 'Transformer Pad Infinity 700', 'tablet' ],
@@ -483,6 +490,7 @@ var UserAgents = (function(){
 		'IS11CA':									[ 'Casio', 'GzOne IS11CA' ],
 		'C771':										[ 'Casio', 'GzOne Commando' ],
 		'CAT NOVA':									[ 'Cat', 'NOVA', 'tablet' ],
+		'ChangHong-Z-ME':							[ 'ChangHong', 'Z-me' ],
 		'ARMM3V':									[ 'chinaleap', 'ARMM3V', 'tablet' ],
 		'CIUS-7':									[ 'Cisco', 'Cius', 'tablet' ],
 		'CIUS-7-AT':								[ 'Cisco', 'Cius', 'tablet' ],
@@ -531,6 +539,7 @@ var UserAgents = (function(){
 		'5860':										[ STRINGS_COOLPAD, '5860' ],
 		'Coolpad 5870':								[ STRINGS_COOLPAD, '5870' ],
 		'Coolpad 7005':								[ STRINGS_COOLPAD, '7005' ],
+		'Coolpad 7019':								[ STRINGS_COOLPAD, '7019' ],
 		'7260':										[ STRINGS_COOLPAD, '7260' ],
 		'Coolpad 7260':								[ STRINGS_COOLPAD, '7260' ],
 		'Coolpad 7260A':							[ STRINGS_COOLPAD, '7260' ],
@@ -789,6 +798,7 @@ var UserAgents = (function(){
 		'HTC Lexikon':								[ STRINGS_HTC, 'Merge' ],
 		'HTC One S':								[ STRINGS_HTC, 'One S' ],
 		'HTC Z520e':								[ STRINGS_HTC, 'One S' ],
+		'HTC Z560e':								[ STRINGS_HTC, 'One S' ],
 		'HTC One V':								[ STRINGS_HTC, 'One V' ],
 		'HTC T320e':								[ STRINGS_HTC, 'One V' ],
 		'HTC One X':								[ STRINGS_HTC, 'One X' ],
@@ -1010,8 +1020,10 @@ var UserAgents = (function(){
 		'Huawei C8812':								[ STRINGS_HUAWEI, 'Ascend C8812' ],
 		'Huawei C8825D':							[ STRINGS_HUAWEI, 'Ascend G330C' ],
 		'Huawei C8860E':							[ STRINGS_HUAWEI, 'Honor' ],
+		'Huawei G300':								[ STRINGS_HUAWEI, 'Ascend G300' ],
 		'Huawei M835':								[ STRINGS_HUAWEI, 'M835' ],
 		'Huawei M860':								[ STRINGS_HUAWEI, 'Ascend' ],
+		'Huawei M920':								[ STRINGS_HUAWEI, 'M920' ],
 		'Huawei M921':								[ STRINGS_HUAWEI, 'M921' ],
 		'Huawei M931':								[ STRINGS_HUAWEI, 'M931' ],
 		'Huawei S8520':								[ STRINGS_HUAWEI, 'S8520' ],
@@ -1117,7 +1129,8 @@ var UserAgents = (function(){
 		'GS03':										[ STRINGS_HUAWEI, 'Ascend P1' ],
 		'DroniX-0.5':								[ STRINGS_HUAWEI, 'U8180' ],
 		'MTS-SP101':								[ STRINGS_HUAWEI, 'C8511' ],
-		'TSP21':									[ STRINGS_HUAWEI, 'U8110' ],								
+		'TSP21':									[ STRINGS_HUAWEI, 'U8110' ],
+		'HW-01E':									[ STRINGS_HUAWEI, 'Ascend HW-01E' ],								
 		'HYUNDAI H6':								[ 'Hyundai', 'Storm H6' ],
 		'iBall Slide i7011':						[ 'iBall', 'Slide i7011' ],
 		'NetTAB RUNE':								[ 'IconBit', 'NetTab Rune', 'tablet' ],
@@ -1207,6 +1220,7 @@ var UserAgents = (function(){
 		'Lenovo S880':								[ STRINGS_LENOVO, 'S880' ],
 		'A30t':										[ STRINGS_LENOVO, 'A30t' ],
 		'Lenovo A60':								[ STRINGS_LENOVO, 'A60' ],
+		'Lenovo A60+':								[ STRINGS_LENOVO, 'A60' ],
 		'Lenovo A65':								[ STRINGS_LENOVO, 'A65' ],
 		'Lenovo A66t':								[ STRINGS_LENOVO, 'A66t' ],
 		'Lenovo A68e':								[ STRINGS_LENOVO, 'A68e' ],
@@ -1414,6 +1428,7 @@ var UserAgents = (function(){
 		'MEIZU M9':									[ 'Meizu', 'M9' ],
 		'MEIZU MX':									[ 'Meizu', 'MX' ],
 		'M030':										[ 'Meizu', 'MX M030' ],
+		'M031':										[ 'Meizu', 'MX M031' ],
 		'M032':										[ 'Meizu', 'MX M032' ],
 		'Slidepad':									[ 'Memup', 'Slidepad', 'tablet' ],
 		'A45':										[ 'Micromax', 'A45 Punk' ],
@@ -1421,6 +1436,8 @@ var UserAgents = (function(){
 		'Micromax A57':								[ 'Micromax', 'A57 Ninja 3' ],
 		'Micromax A60':								[ 'Micromax', 'Andro A60' ],
 		'Micromax A70':								[ 'Micromax', 'Andro A70' ],
+		'Micromax A87':								[ 'Micromax', 'A87 Ninja 4' ],
+		'Micromax A90':								[ 'Micromax', 'A90 Superfone' ],
 		'P300(Funbook)':							[ 'Micromax', 'Funbook P300', 'tablet' ],
 		'AT735':									[ 'Moinstone', 'AT735', 'tablet' ],
 		'A853':										[ STRINGS_MOTOROLA, 'Milestone' ],
@@ -1726,6 +1743,7 @@ var UserAgents = (function(){
 		'W10 V2.0':									[ 'Ramos', 'W10 v2.0', 'tablet' ],
 		'T11AD':									[ 'Ramos', 'T11AD', 'tablet' ],
 		'T11AD.FE':									[ 'Ramos', 'T11AD', 'tablet' ],
+		'Rikomagic MK802':							[ 'Rikomagic', 'MK802', 'television' ],
 		'PlayBook':									[ 'RIM', 'BlackBerry PlayBook', 'tablet' ],
 		'RBK-490':									[ 'Ritmix', 'RBK-490', 'tablet' ],
 		'A8HD':										[ 'Saayi', 'Dropad A8HD', 'tablet' ],
@@ -1755,6 +1773,7 @@ var UserAgents = (function(){
 		'GT-I5800L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Apollo' ],
 		'GT-I5801':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Apollo' ],
 		'GT-I6500U':								[ STRINGS_SAMSUNG, 'Saturn' ],
+		'GT-I777':									[ STRINGS_SAMSUNG, 'Singa' ],
 		'GT-I8000':									[ STRINGS_SAMSUNG, 'Omnia 2' ],
 		'GT-I8150':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' W' ],
 		'GT-I8150B':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' W' ],
@@ -1798,6 +1817,7 @@ var UserAgents = (function(){
 		'GT-I9300':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
 		'GT-I9300T':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
 		'GT-I9303T':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
+		'GT-I9305T':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
 		'GT-I9308':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
 		'GT-I9500':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' GT-I9500' ],
 		'GT-I9800':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' GT-I9800' ],
@@ -1847,6 +1867,7 @@ var UserAgents = (function(){
 		'GT-S5360':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y' ],
 		'GT-S5360B':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y' ],
 		'GT-S5360L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y' ],
+		'GT-S5360T':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y' ],
 		'GT-S5363':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y' ],
 		'GT-S5367':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y TV' ],
 		'GT-S5368':									[ STRINGS_SAMSUNG, 'GT-S5368' ],
@@ -1886,6 +1907,7 @@ var UserAgents = (function(){
 		'GT-S7500':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace Plus' ],
 		'GT-S7500L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace Plus' ],
 		'GT-S7500W':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace Plus' ],
+		'GT-S7562':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Duos' ],
 		'GT-T959':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Vibrant' ],
 		'SCH-i509':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y' ],
 		'SCH-i559':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Pop' ],
@@ -2022,6 +2044,7 @@ var UserAgents = (function(){
 		'SHW-M250S':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
 		'SHW-M300W':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1', 'tablet' ],
 		'SHW-M305W':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 8.9', 'tablet' ],
+		'SHW-M340K':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' M Style' ],
 		'SHW-M340S':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' M Style' ],
 		'SHW-M380K':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1', 'tablet' ],
 		'SHW-M380S':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1', 'tablet' ],
@@ -2143,6 +2166,7 @@ var UserAgents = (function(){
 		'LT18iv':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc S' ],
 		'LT18i-o':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc S' ],
 		'LT22i':									[ 'Sony', STRINGS_XPERIA + ' P' ],
+		'Lt26i':									[ 'Sony', STRINGS_XPERIA + ' S' ],
 		'LT26i':									[ 'Sony', STRINGS_XPERIA + ' S' ],
 		'LT26i-o':									[ 'Sony', STRINGS_XPERIA + ' S' ],
 		'LT26ii':									[ 'Sony', STRINGS_XPERIA + ' SL' ],
@@ -2192,6 +2216,7 @@ var UserAgents = (function(){
 		'SonyST23i':								[ 'Sony', STRINGS_XPERIA + ' Miro' ],
 		'ST23i':									[ 'Sony', STRINGS_XPERIA + ' Miro' ],
 		'ST25i':									[ 'Sony', STRINGS_XPERIA + ' U' ],
+		'SonyST26i':								[ 'Sony', STRINGS_XPERIA + ' J' ],
 		'ST27i':									[ 'Sony', STRINGS_XPERIA + ' Go' ],
 		'U20a':										[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10 Mini Pro' ],
 		'U20i':										[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10 Mini Pro' ],
@@ -2238,6 +2263,7 @@ var UserAgents = (function(){
 		'Xperia NeoV':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo V' ],
 		'Xperia Neo V':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo V' ],
 		'Xperia Play':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Play' ],
+		'Xperia Pro':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Pro' ],
 		'Sony Ericsson Xperia X1':					[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X1' ],
 		'SonyHayabusa':								[ 'Sony', STRINGS_XPERIA + ' Ion' ],
 		'Hayabusa':									[ 'Sony', STRINGS_XPERIA + ' Ion' ],
@@ -2287,6 +2313,7 @@ var UserAgents = (function(){
 		'TOSHIBA FOLIO AND A':						[ STRINGS_TOSHIBA, 'Folio 100', 'tablet' ],
 		'T-01C':									[ STRINGS_TOSHIBA, 'Regza T-01C' ],
 		'T-01D':									[ STRINGS_TOSHIBA, 'Regza T-01D' ],
+		'T-02D':									[ STRINGS_TOSHIBA, 'Regza T-02D' ],
 		'IS04':										[ STRINGS_TOSHIBA, 'Regza IS04' ],
 		'IS11T':									[ STRINGS_TOSHIBA, 'Regza IS11T' ],
 		'AT1S0':									[ STRINGS_TOSHIBA, 'Regza AT1S0' ],
@@ -2333,6 +2360,8 @@ var UserAgents = (function(){
 		'M12':										[ 'Wopad', 'M12', 'tablet' ],
 		'WM8650':									[ 'WonderMedia', 'WM8650', 'tablet' ],
 		'MI-ONE':									[ 'Xiaomi', 'MI-ONE' ],
+		'MI 1S':									[ 'Xiaomi', 'MI-ONE S' ],
+		'MI 1SC':									[ 'Xiaomi', 'MI-ONE SC' ],
 		'MI-ONE C1':								[ 'Xiaomi', 'MI-ONE C1' ],
 		'MI-ONE Plus':								[ 'Xiaomi', 'MI-ONE Plus' ],
 		'mione plus':								[ 'Xiaomi', 'MI-ONE Plus' ],
@@ -2923,7 +2952,7 @@ var UserAgents = (function(){
 				
 				if (ua.match('WP7')) {
 					this.os.name = 'Windows Phone';
-					this.os.version = new Version({ value: '7.0', details: 2 });
+					this.os.version = new Version({ value: '7', details: 1 });
 					this.device.type = 'mobile';
 					this.browser.mode = 'desktop';
 				}
@@ -5083,6 +5112,7 @@ var UserAgents = (function(){
 			var browsers = [
 				{ name: 'AdobeAIR', 			regexp: /AdobeAIR\/([0-9.]*)/ },
 				{ name: 'Awesomium', 			regexp: /Awesomium\/([0-9.]*)/ },
+				{ name: 'Bsalsa Embedded',		regexp: /EmbeddedWB ([0-9.]*)/ },
 				{ name: 'Canvace',				regexp: /Canvace Standalone\/([0-9.]*)/ },
 				{ name: 'Ekioh', 				regexp: /Ekioh\/([0-9.]*)/ },
 				{ name: 'JavaFX', 				regexp: /JavaFX\/([0-9.]*)/ },
@@ -5145,12 +5175,13 @@ var UserAgents = (function(){
 				{ name: 'Lightning',			regexp: /Lightning\/([0-9.]*)/ },
 				{ name: 'Lunascape', 			regexp: /Lunascape[\/| ]([0-9.]*)/, details: 3 },
 				{ name: 'iLunascape', 			regexp: /iLunascape\/([0-9.]*)/, details: 3 },
+				{ name: 'Intermec Browser', 	regexp: /Intermec\/([0-9.]*)/, details: 2 },
 				{ name: 'MaCross Mobile',		regexp: /MaCross\/([0-9.]*)/ },
 				{ name: 'Maxthon', 				regexp: /Maxthon[\/ ]([0-9.]*)/, details: 3 },
 				{ name: 'MiniBrowser',			regexp: /MiniBr?owserM\/([0-9.]*)/ },
 				{ name: 'MiniBrowser',			regexp: /MiniBrowserMobile\/([0-9.]*)/ },
 				{ name: 'MixShark', 			regexp: /MixShark\/([0-9.]*)/ },
-				{ name: 'Motorola WebKit',		regexp: /MotorolaWebKit\/([0-9.]*)/, details: 3 },
+				{ name: 'Motorola WebKit',		regexp: /MotorolaWebKit(?:\/([0-9.]*))?/, details: 3 },
 				{ name: 'NetFront LifeBrowser',	regexp: /NetFrontLifeBrowser\/([0-9.]*)/ },
 				{ name: 'Netscape Navigator', 	regexp: /Navigator\/([0-9.]*)/, details: 3 },
 				{ name:	'Odyssey',				regexp: /OWB\/([0-9.]*)/ },
@@ -5180,6 +5211,7 @@ var UserAgents = (function(){
 				{ name: 'TaoBrowser',			regexp: /TaoBrowser\/([0-9.]*)/, details: 2 },
 				{ name: 'TaomeeBrowser', 		regexp: /TaomeeBrowser\/([0-9.]*)/, details: 2 },
 				{ name:	'TazWeb',				regexp: /TazWeb/ },
+				{ name: 'Uzbl', 				regexp: /^Uzbl/ },
 				{ name: 'Viera', 				regexp: /Viera\/([0-9.]*)/ },
 				{ name: 'Villanova', 			regexp: /Villanova\/([0-9.]*)/, details: 3 },
 				{ name: 'Wavelink Velocity', 	regexp: /Wavelink Velocity Browser\/([0-9.]*)/, details: 2 },

From 8f3c13e6c0c7f82a3dd6e7ed9a13816d6ab8f84b Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Thu, 4 Oct 2012 14:50:07 +0200
Subject: [PATCH 054/174] The wrong blacklist entry was used for fullscreen
 detection

---
 scripts/engine.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/engine.js b/scripts/engine.js
index b4cd04fa..0cfe077d 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -2890,7 +2890,7 @@ Test = (function() {
 			
 			this.section.setItem({
 				id:			'requestFullScreen',
-				passed:		!blacklists.subtitle && (!! document.documentElement.requestFullscreen || !! document.documentElement.webkitRequestFullScreen || !! document.documentElement.mozRequestFullScreen || !! document.documentElement.msRequestFullScreen), 
+				passed:		!blacklists.fullScreen && (!! document.documentElement.requestFullscreen || !! document.documentElement.webkitRequestFullScreen || !! document.documentElement.mozRequestFullScreen || !! document.documentElement.msRequestFullScreen), 
 				value: 		4
 			});
 			

From 92901c15f0f2540b87ec4aa9c84356d60ba3f294 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Thu, 4 Oct 2012 14:50:34 +0200
Subject: [PATCH 055/174] Add a new blacklist for the FileSystem API

---
 scripts/engine.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/engine.js b/scripts/engine.js
index 0cfe077d..1e540ce1 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -20,6 +20,7 @@ Test = (function() {
 				numberField:		false,
 				progressField:		false,
 				meterField:			false,
+				fileSystem:			Browsers.isOs('BlackBerry Tablet OS'),
 				subtitle:			Browsers.isBrowser('Sogou Explorer'),
 				notifications:		Browsers.isBrowser('Sogou Explorer'),
 				fullScreen:			Browsers.isBrowser('Sogou Explorer'),
@@ -2729,7 +2730,7 @@ Test = (function() {
 
 			this.section.setItem({
 				id:			'fileSystem',
-				passed:		!! window.requestFileSystem || !! window.webkitRequestFileSystem || !! window.mozRequestFileSystem || !! window.oRequestFileSystem || !! window.msRequestFileSystem, 
+				passed:		!blacklists.fileSystem && (!! window.requestFileSystem || !! window.webkitRequestFileSystem || !! window.mozRequestFileSystem || !! window.oRequestFileSystem || !! window.msRequestFileSystem), 
 				value: 		0
 			});
 		}

From 0244787b8ea72ff341f1b9b32e0b86e1f7ef6a47 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Thu, 4 Oct 2012 14:50:52 +0200
Subject: [PATCH 056/174] Add BlackBerry to the Full Screen blacklist

---
 scripts/engine.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/engine.js b/scripts/engine.js
index 1e540ce1..af0c2794 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -23,7 +23,7 @@ Test = (function() {
 				fileSystem:			Browsers.isOs('BlackBerry Tablet OS'),
 				subtitle:			Browsers.isBrowser('Sogou Explorer'),
 				notifications:		Browsers.isBrowser('Sogou Explorer'),
-				fullScreen:			Browsers.isBrowser('Sogou Explorer'),
+				fullScreen:			Browsers.isBrowser('Sogou Explorer') || Browsers.isOs('BlackBerry Tablet OS') || Browsers.isOs('BlackBerry OS'),
 				getUserMedia:		Browsers.isBrowser('Sogou Explorer') || Browsers.isBrowser('UC Browser') || Browsers.isBrowser('Dolphin'),
 				webgl:				false,
 			};		

From df994d323c1d7f5eec45c3af5ba10a43e48e6675 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Fri, 5 Oct 2012 08:38:07 +0200
Subject: [PATCH 057/174] Remove unneeded comma

---
 scripts/engine.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/engine.js b/scripts/engine.js
index af0c2794..b2b8fadd 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -25,7 +25,7 @@ Test = (function() {
 				notifications:		Browsers.isBrowser('Sogou Explorer'),
 				fullScreen:			Browsers.isBrowser('Sogou Explorer') || Browsers.isOs('BlackBerry Tablet OS') || Browsers.isOs('BlackBerry OS'),
 				getUserMedia:		Browsers.isBrowser('Sogou Explorer') || Browsers.isBrowser('UC Browser') || Browsers.isBrowser('Dolphin'),
-				webgl:				false,
+				webgl:				false
 			};		
 			
 			whitelists = {

From 8e0ca2b09841cf866f3f26a6689e541ed7a88dba Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Fri, 5 Oct 2012 08:38:22 +0200
Subject: [PATCH 058/174] Only translate when we find querySelectorAll

---
 scripts/template.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/scripts/template.js b/scripts/template.js
index 24873c18..5af8219e 100644
--- a/scripts/template.js
+++ b/scripts/template.js
@@ -21,11 +21,13 @@
 	}
 	
 	function translate() {
-		var elements = document.querySelectorAll('[data-i18n]');
-		for (var i = 0; i < elements.length; i++) {
-			var id = elements[i].getAttribute('data-i18n');
-			if (id == '') id = elements[i].innerHTML;
-			if (id && translation[id]) elements[i].innerHTML = translation[id];
+		if (document.querySelectorAll) {
+			var elements = document.querySelectorAll('[data-i18n]');
+			for (var i = 0; i < elements.length; i++) {
+				var id = elements[i].getAttribute('data-i18n');
+				if (id == '') id = elements[i].innerHTML;
+				if (id && translation[id]) elements[i].innerHTML = translation[id];
+			}
 		}
 	}
 })();

From 8dfab1b5a66960e45bcdc8096a417c40457dea31 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Fri, 5 Oct 2012 08:55:11 +0200
Subject: [PATCH 059/174] Prevent an error in IE6

---
 scripts/reporting.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/reporting.js b/scripts/reporting.js
index 00d5c3a6..aedaf1dc 100644
--- a/scripts/reporting.js
+++ b/scripts/reporting.js
@@ -12,6 +12,7 @@
 			});
 		}
 		function addListen(obj, i){
+			if(!obj) return obj;
 			if(i = obj.length)while(i--)obj[i].addEventListener = addEvent;
 			else obj.addEventListener = addEvent;
 			return obj;

From 9fe52108fcc494637a3ac9c1c916df569f470f1d Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Fri, 5 Oct 2012 11:04:30 +0200
Subject: [PATCH 060/174] Fix a rendering problem with rounded corners in Opera

---
 css/main.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/css/main.css b/css/main.css
index a809e300..02bdced5 100644
--- a/css/main.css
+++ b/css/main.css
@@ -699,7 +699,7 @@ body {
 
 
 .resultsTable table {
-	border-collapse: collapse;
+	border-spacing: 0;
 	
 	position: relative;
 	width: 100%;

From bc0df2563ecc0df5450d1fcdb3cab03801cc1b0b Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Fri, 5 Oct 2012 11:05:23 +0200
Subject: [PATCH 061/174] Add support for detecting Nokia Xpress

---
 scripts/useragents.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index d97a6985..ba1ac8d5 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -4727,6 +4727,25 @@ var UserAgents = (function(){
 				}
 			}
 			
+			/****************************************************
+			 *		Nokia Xpress
+			 *
+			 *		Mozilla/5.0 (X11; Linux x86_64; rv:5.0.1) Gecko/20120822 OSRE/1.0.7f
+			 */
+			
+			if (ua.match('OSRE')) {
+				this.browser.name = 'Nokia Xpress';
+				this.browser.mode = 'proxy';
+
+				if (match = /OSRE\/([0-9.]*)/.exec(ua)) {
+					this.browser.version = new Version({ value: match[1], details: 3 });
+				}
+
+				this.os.name = 'Windows Phone';
+				this.device.type = 'mobile';
+			}
+			
+			
 			/****************************************************
 			 *		MicroB
 			 */

From 1725524cde577f0847b5c649bb8f1a5b16b29643 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Fri, 5 Oct 2012 11:28:03 +0200
Subject: [PATCH 062/174] A couple of new additions to the model database

---
 scripts/useragents.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index ba1ac8d5..671b7060 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -203,6 +203,7 @@ var UserAgents = (function(){
 			'Lumia 710':							[ 'Nokia', 'Lumia 710' ],
 			'Lumia 719':							[ 'Nokia', 'Lumia 719' ],
 			'Nokia 800C':							[ 'Nokia', 'Lumia 800' ],
+			'Nokia 800':							[ 'Nokia', 'Lumia 800' ],
 			'Lumia 800':							[ 'Nokia', 'Lumia 800' ],
 			'800':									[ 'Nokia', 'Lumia 800' ],
 			'Lumia 900':							[ 'Nokia', 'Lumia 900' ],
@@ -453,6 +454,7 @@ var UserAgents = (function(){
 		'Transformer Prime TF201':					[ STRINGS_ASUS, 'Eee Pad Transformer Prime', 'tablet' ],
 		'Transformer Prime':						[ STRINGS_ASUS, 'Eee Pad Transformer Prime', 'tablet' ],
 		'Transformer Pad TF300T':					[ STRINGS_ASUS, 'Transformer Pad 300', 'tablet' ],
+		'Transformer Pad TF700T':					[ STRINGS_ASUS, 'Transformer Pad Infinity 700', 'tablet' ],
 		'ASUS Transformer TF300T':					[ STRINGS_ASUS, 'Transformer Pad 300', 'tablet' ],
 		'ASUS Transformer Pad TF300T':				[ STRINGS_ASUS, 'Transformer Pad 300', 'tablet' ],
 		'ASUS Transformer Pad TF300TG':				[ STRINGS_ASUS, 'Transformer Pad 300', 'tablet' ],
@@ -651,6 +653,7 @@ var UserAgents = (function(){
 		'COSMO DUO':								[ 'Hiscreen', 'Cosmo DUO', 'tablet' ],
 		'HS-U8':									[ 'Hisense', 'U8' ],
 		'HS-T92':									[ 'Hisense', 'T92' ],
+		'HS-T96':									[ 'Hisense', 'T96' ],
 		'HS-E860':									[ 'Hisense', 'E860' ],
 		'E860':										[ 'Hisense', 'E860' ],
 		'HS-E910':									[ 'Hisense', 'E910' ],
@@ -2176,8 +2179,9 @@ var UserAgents = (function(){
 		'LT28i':									[ 'Sony', STRINGS_XPERIA + ' Ion' ],
 		'LT29i':									[ 'Sony', STRINGS_XPERIA + ' GX' ],
 		'SonyLT29i':								[ 'Sony', STRINGS_XPERIA + ' GX' ],
-		'SonyLT30a':								[ 'Sony', STRINGS_XPERIA + ' Mint' ],
-		'SonyLT30p':								[ 'Sony', STRINGS_XPERIA + ' Mint' ],
+		'SonyLT30a':								[ 'Sony', STRINGS_XPERIA + ' T' ],
+		'SonyLT30p':								[ 'Sony', STRINGS_XPERIA + ' T' ],
+		'LT30p':									[ 'Sony', STRINGS_XPERIA + ' T' ],
 		'MK16a':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Pro' ],
 		'MK16i':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Pro' ],
 		'MT11a':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo V' ],

From d5da714e47cf4839768d7c0415fb678358633bd9 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Fri, 5 Oct 2012 12:27:28 +0200
Subject: [PATCH 063/174] Add support for full screen graphs usign the
 non-prefixed API as used by Opera

---
 backend/templates/results.html |  2 +-
 css/main.css                   | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/backend/templates/results.html b/backend/templates/results.html
index 16ad995e..8d3b4c46 100644
--- a/backend/templates/results.html
+++ b/backend/templates/results.html
@@ -281,7 +281,7 @@ <h2 data-i18n>Timeline</h2>
 						if (canvas.requestFullscreen) {
 							button.style.display = '';
 							button.addEventListener('click', function() {
-								if (document.fullscreenEnabled) 
+								if (document.fullscreenElement) 
 									document.exitFullscreen();
 								else
 									canvas.requestFullscreen();
diff --git a/css/main.css b/css/main.css
index 02bdced5..071c1b6a 100644
--- a/css/main.css
+++ b/css/main.css
@@ -1495,6 +1495,30 @@ body {
 }
 
 
+div:fullscreen {
+	background: #fff;
+	width: 100% !important;
+	height: 100% !important;
+}
+div:fullscreen h2 {
+	display: none;
+}
+div:fullscreen #fsButton {
+	top: 10px;
+	right: 40px;
+}
+div:fullscreen #fsButton::before {
+	content: '+';
+}
+div:fullscreen #timelineGraph {
+	position: absolute;
+	top: 50px;
+	left: 30px;
+	bottom: 30px;
+	right: 30px;
+	height: auto !important;
+}
+
 div:-webkit-full-screen {
 	background: #fff;
 	width: 100% !important;

From 9ac6f0f8c0e589eb51bc7ee52aceca576158dc13 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Mon, 15 Oct 2012 18:56:14 +0200
Subject: [PATCH 064/174] Update date for release of 4.0

---
 about.html                     | 2 +-
 backend/templates/browser.html | 2 +-
 backend/templates/feature.html | 2 +-
 backend/templates/results.html | 2 +-
 donate.html                    | 2 +-
 index.html                     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/about.html b/about.html
index 7ba4b4f4..736fb962 100644
--- a/about.html
+++ b/about.html
@@ -256,7 +256,7 @@ <h3>What kind of data is collected from visitors?</h3>
 				
 				<div class='copyright'>
 					<p>Copyright 2010-2012 by Sights</p>
-					<p>August, 2012 - version 4.0</p>
+					<p>October, 2012 - version 4.0</p>
 					<p data-i18n='footer'>
 						The HTML5 test is being developed at <a href='http://github.com/NielsLeenheer/html5test'>Github</a>. Please file an issue there if you find any bugs or think of any improvements to this test.
 						Please note that the HTML5 test is not affiliated with the W3C or the HTML5 working group.
diff --git a/backend/templates/browser.html b/backend/templates/browser.html
index c83582b2..08dd2b4a 100644
--- a/backend/templates/browser.html
+++ b/backend/templates/browser.html
@@ -112,7 +112,7 @@ <h3 data-i18n>About these scores</h3>
 				
 				<div class='copyright'>
 					<p>Copyright 2010-2012 by Sights</p>
-					<p>August, 2012 - version 4.0</p>
+					<p>October, 2012 - version 4.0</p>
 					<p data-i18n='footer'>
 						The HTML5 test is being developed at <a href='http://github.com/NielsLeenheer/html5test'>Github</a>. Please file an issue there if you find any bugs or think of any improvements to this test.
 						Please note that the HTML5 test is not affiliated with the W3C or the HTML5 working group.
diff --git a/backend/templates/feature.html b/backend/templates/feature.html
index f2934319..61c33f6e 100644
--- a/backend/templates/feature.html
+++ b/backend/templates/feature.html
@@ -103,7 +103,7 @@ <h3 data-i18n>About these scores</h3>
 				
 				<div class='copyright'>
 					<p>Copyright 2010-2012 by Sights</p>
-					<p>August, 2012 - version 4.0</p>
+					<p>October, 2012 - version 4.0</p>
 					<p data-i18n='footer'>
 						The HTML5 test is being developed at <a href='http://github.com/NielsLeenheer/html5test'>Github</a>. Please file an issue there if you find any bugs or think of any improvements to this test.
 						Please note that the HTML5 test is not affiliated with the W3C or the HTML5 working group.
diff --git a/backend/templates/results.html b/backend/templates/results.html
index 8d3b4c46..3ce7de29 100644
--- a/backend/templates/results.html
+++ b/backend/templates/results.html
@@ -313,7 +313,7 @@ <h3 data-i18n>About these scores</h3>
 				
 				<div class='copyright'>
 					<p>Copyright 2010-2012 by Sights</p>
-					<p>August, 2012 - version 4.0</p>
+					<p>October, 2012 - version 4.0</p>
 					<p data-i18n='footer'>
 						The HTML5 test is being developed at <a href='http://github.com/NielsLeenheer/html5test'>Github</a>. Please file an issue there if you find any bugs or think of any improvements to this test.
 						Please note that the HTML5 test is not affiliated with the W3C or the HTML5 working group.
diff --git a/donate.html b/donate.html
index a18ea388..fab54cfb 100644
--- a/donate.html
+++ b/donate.html
@@ -147,7 +147,7 @@ <h3>Devices</h3>
 				
 				<div class='copyright'>
 					<p>Copyright 2010-2012 by Sights</p>
-					<p>April, 2012 - version 3.0</p>
+					<p>October, 2012 - version 4.0</p>
 					<p data-i18n='footer'>
 						The HTML5 test is being developed at <a href='http://github.com/NielsLeenheer/html5test'>Github</a>. Please file an issue there if you find any bugs or think of any improvements to this test.
 						Please note that the HTML5 test is not affiliated with the W3C or the HTML5 working group.
diff --git a/index.html b/index.html
index d2d6cd78..8d82f67a 100644
--- a/index.html
+++ b/index.html
@@ -177,7 +177,7 @@ <h2>
 				
 				<div class='copyright'>
 					<p>Copyright 2010-2012 by Sights</p>
-					<p>August, 2012 - version 4.0</p>
+					<p>October, 2012 - version 4.0</p>
 					<p data-i18n='footer'>
 						The HTML5 test is being developed at <a href='http://github.com/NielsLeenheer/html5test'>Github</a>. Please file an issue there if you find any bugs or think of any improvements to this test.
 						Please note that the HTML5 test is not affiliated with the W3C or the HTML5 working group.

From 2008c9c7999d2be868a4fad8f8799e3a096db2e0 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Mon, 15 Oct 2012 18:56:40 +0200
Subject: [PATCH 065/174] Update version number in config file

---
 backend/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/config.php b/backend/config.php
index 66c85416..c621df03 100644
--- a/backend/config.php
+++ b/backend/config.php
@@ -1,7 +1,7 @@
 <?php
 
-	$version = '3.00';
 	$readonly = false;
+	$version = '4.00';
 	
 	$mysql['server'] = 'localhost';
 	$mysql['username'] = '*****';

From cf49361c9735d48c26688e7d9dc90db723084c78 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Mon, 15 Oct 2012 18:57:17 +0200
Subject: [PATCH 066/174] Collect additional useragent headers

---
 backend/index.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/backend/index.php b/backend/index.php
index 3ef881ee..534d6f56 100644
--- a/backend/index.php
+++ b/backend/index.php
@@ -80,6 +80,9 @@
 			$headers = apache_request_headers();
 						
 			$xWapProfile = isset($headers['x-wap-profile']) ? $headers['x-wap-profile'] : '';
+			$xDeviceStockUA = isset($headers['Device-Stock-UA']) ? $headers['Device-Stock-UA'] : '';
+			$xDeviceUserAgent = isset($headers['X-Device-User-Agent']) ? $headers['X-Device-User-Agent'] : '';
+			$xOriginalUserAgent = isset($headers['X-Original-User-Agent']) ? $headers['X-Original-User-Agent'] : '';
 			$xOperaMiniPhoneUA = isset($headers['X-OperaMini-Phone-UA']) ? $headers['X-OperaMini-Phone-UA'] : '';
 			
 			if (!$readonly) {
@@ -115,6 +118,9 @@
 						useragent = "' . mysql_real_escape_string($payload->useragent) . '",
 						humanReadable = "' . mysql_real_escape_string($payload->humanReadable) . '",
 						xWapProfile = "' . mysql_real_escape_string($xWapProfile) . '",
+						xDeviceStockUA = "' . mysql_real_escape_string($xDeviceStockUA) . '",
+						xDeviceUserAgent = "' . mysql_real_escape_string($xDeviceUserAgent) . '",
+						xOriginalUserAgent = "' . mysql_real_escape_string($xOriginalUserAgent) . '",
 						xOperaMiniPhoneUA = "' . mysql_real_escape_string($xOperaMiniPhoneUA) . '",
 						results = "' . mysql_real_escape_string($payload->results) . '",
 						points = "' . mysql_real_escape_string($payload->points) . '",

From 7bc17d630869c06841eb2385d82fcfb2aa123aa9 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Mon, 15 Oct 2012 18:57:41 +0200
Subject: [PATCH 067/174] Make a fingerprint based on test results

---
 backend/index.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/index.php b/backend/index.php
index 534d6f56..ec28ba7d 100644
--- a/backend/index.php
+++ b/backend/index.php
@@ -124,6 +124,7 @@
 						xOperaMiniPhoneUA = "' . mysql_real_escape_string($xOperaMiniPhoneUA) . '",
 						results = "' . mysql_real_escape_string($payload->results) . '",
 						points = "' . mysql_real_escape_string($payload->points) . '",
+						fingerprint = "' . mysql_real_escape_string(md5($payload->results.$payload->points)) . '",
 						status = 0
 				');
 			}

From 2187d358f470a922281372d0b900426aa803197f Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Mon, 15 Oct 2012 18:59:51 +0200
Subject: [PATCH 068/174] Make sure the points in the header do not mess with
 the first column on small displays

---
 css/main.css | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/css/main.css b/css/main.css
index 071c1b6a..b2c12611 100644
--- a/css/main.css
+++ b/css/main.css
@@ -726,6 +726,7 @@ body {
 	
 	font-size: 1.1em;
 	text-align: left;
+	height: 38px;
 }
 .resultsTable table thead td {
 	padding: 3px 10px;
@@ -736,6 +737,12 @@ body {
 	font-size: 1.8em;
 	text-align: right;
 	color: #999;
+	width: 50px;
+}
+.resultsTable table thead td div.grade {
+	position: absolute;
+	right: 10px;
+	top: 4px;
 }
 .resultsTable table thead td span.none {
 	color: #853333;
@@ -753,9 +760,9 @@ body {
 	color: #33af33;
 }
 .resultsTable table thead td span.bonus {
-	position: absolute;
-	margin-top: 5px;
-	margin-left: -155px;
+	position: relative;
+	top: -6px;
+	left: -10px;
 	
 	white-space: nowrap;
 	font-family: 'Droid Sans', Arial, Helvetica, sans-serif;

From 2f7a76afa82c417559ed4fa2bf0cbb7894b912af Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Mon, 15 Oct 2012 19:00:51 +0200
Subject: [PATCH 069/174] Add links to Webplatform.org and MDN

---
 css/main.css            | 111 ++++++++++++++++++-
 images/khronos-logo.png | Bin 0 -> 3498 bytes
 images/mdn-logo.png     | Bin 0 -> 3835 bytes
 images/w3c-logo.png     | Bin 0 -> 2561 bytes
 images/wp-logo.png      | Bin 0 -> 2542 bytes
 scripts/data.js         | 235 +++++++++++++++++++++++++++++++++-------
 scripts/reporting.js    | 111 +++++++++++++++++--
 7 files changed, 400 insertions(+), 57 deletions(-)
 create mode 100644 images/khronos-logo.png
 create mode 100644 images/mdn-logo.png
 create mode 100644 images/w3c-logo.png
 create mode 100644 images/wp-logo.png

diff --git a/css/main.css b/css/main.css
index b2c12611..f72f802b 100644
--- a/css/main.css
+++ b/css/main.css
@@ -825,6 +825,12 @@ body {
 	cursor: pointer;
 	padding-left: 28px;
 }
+.resultsTable table tr th.hasLink:hover {
+	cursor: pointer;
+}
+.resultsTable table tr th.hasLink:hover span {
+	text-decoration: underline;
+}
 .resultsTable table tr.hasChild th > * {
 	position: relative;
 }
@@ -897,6 +903,101 @@ body {
 }
 
 
+.resultsTable .linksPanel {
+	position: absolute;
+	background: #fff;
+	z-index: 1;
+
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+	
+	-webkit-box-shadow: 0px 0px 10px #666, 0px 0px 100px rgba(0,0,0,0.5);
+	-moz-box-shadow: 0px 0px 10px #666, 0px 0px 100px rgba(0,0,0,0.5);
+	-ms-box-shadow: 0px 0px 10px #666, 0px 0px 100px rgba(0,0,0,0.5);
+	-o-box-shadow: 0px 0px 10px #666, 0px 0px 100px rgba(0,0,0,0.5);
+	box-shadow: 0px 0px 10px #666, 0px 0px 100px rgba(0,0,0,0.5);
+
+	max-width: 120%;
+	border: 1px solid rgba(245,245,245,0.9);
+	padding: 6px 0;
+	margin-top: 8px;
+}
+.resultsTable .linksPanel::before {
+	content: '';
+	display: block;
+	
+	position: absolute;
+	width: 0;
+	height: 0;
+	top: -9px;
+	left: 10px;
+	z-index: 10;
+	
+	border-bottom: 8px solid rgba(30,30,30,0.1);
+	border-right: 8px solid transparent;
+	border-left: 8px solid transparent;
+}
+.resultsTable .linksPanel::after {
+	content: '';
+	display: block;
+	
+	position: absolute;
+	width: 0;
+	height: 0;
+	top: -7px;
+	left: 10px;
+	z-index: 11;
+	
+	border-bottom: 8px solid #fff;
+	border-right: 8px solid transparent;
+	border-left: 8px solid transparent;
+}
+.resultsTable .linksPanel h3 {
+	line-height: 32px;
+	padding: 0 10px;
+	border-bottom: 1px solid #eee;
+}
+.resultsTable .linksPanel a {
+	display: block;
+	white-space: nowrap;
+	line-height: 30px;
+	padding: 0 10px;
+
+	background-size: 24px 24px;
+	background-position: 10px center;
+	background-repeat: no-repeat;
+
+	overflow: hidden;
+	text-overflow: ellipsis;
+} 
+.resultsTable .linksPanel a:hover {
+	background-color: #eee;
+	text-decoration: none;
+}
+.resultsTable .linksPanel a.compare {
+	border-bottom: 1px solid #eee;
+}
+.resultsTable .linksPanel a.w3c {
+	background-image: url(/images/w3c-logo.png);
+	background-size: 24px 24px;
+	text-indent: 32px;
+}
+.resultsTable .linksPanel a.khronos {
+	background-image: url(/images/khronos-logo.png);
+	background-size: 24px 24px;
+	text-indent: 32px;
+}
+.resultsTable .linksPanel a.wp {
+	background-image: url(/images/wp-logo.png);
+	background-size: 24px 24px;
+	text-indent: 32px;
+}
+.resultsTable .linksPanel a.mdn {
+	background-image: url(/images/mdn-logo.png);
+	text-indent: 32px;
+}
+
 
 .comparisonTable table {
 	margin-bottom: 30px;
@@ -1172,11 +1273,11 @@ body {
 	-moz-border-radius: 6px;
 	border-radius: 6px;
 	
-	-webkit-box-shadow: 0px 0px 10px #666;
-	-moz-box-shadow: 0px 0px 10px #666;
-	-ms-box-shadow: 0px 0px 10px #666;
-	-o-box-shadow: 0px 0px 10px #666;
-	box-shadow: 0px 0px 10px #666;
+	-webkit-box-shadow: 0px 0px 10px #666, 0px 0px 100px rgba(0,0,0,0.5);
+	-moz-box-shadow: 0px 0px 10px #666, 0px 0px 100px rgba(0,0,0,0.5);
+	-ms-box-shadow: 0px 0px 10px #666, 0px 0px 100px rgba(0,0,0,0.5);
+	-o-box-shadow: 0px 0px 10px #666, 0px 0px 100px rgba(0,0,0,0.5);
+	box-shadow: 0px 0px 10px #666, 0px 0px 100px rgba(0,0,0,0.5);
 	border:1px solid rgba(245,245,245,0.9);
 	
 	height: 400px;
diff --git a/images/khronos-logo.png b/images/khronos-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b4e160d7f969d73c449d808c4fff78c669b6b4c
GIT binary patch
literal 3498
zcmV;b4OQ}qP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU<Oi4sRRCwC#SqW?$)fs*>JA2N0FYkIc
zJ~pv8PU6IlowzY^E)1b0908KFP@vFOLamBKDJm`W;3%a?tt#3|NTm{0RZ)&6kfb4m
z5C{ng1Y(>Rh)rV0Bx|p)y=ITuYj$U5`@QvsrV)oJM^(uqz3h7C?acrE$M=8#geew_
z<p23#W&q3pm;o>YU<SZv0&vI1jZ<G3hU5zc(jN$ryrPh<B}<6IY9%?Go8@p2omNYP
zM1q)&M#5l!Fd8LhgMkbOgTyy$7CG48Z@qNsQg>dKUHyK)W0u`+t93XmcAhs6jgFc)
zmMzY4xzd4fSR9YV5`{t`)=^&{Jb2>7IPM#9nM{fm_lu>|#EEC{cwSLeNiLr!gP{;H
zuq<h?+ern-k;8sJISe~bVK4V-(5kp$0pK(&t26R^W1YuyK}}Uvi_d0j>#V7%<z=~2
zm(Sa-T(E#qb2%cXQbZL5(hBDkWtrs1$4RqJM_7-C6k$k?WpfQJE#Z`^j!mXgz1c$H
zSbk#Sh+HfV;yDtFXMR$CaMLxMMuoRn7B{%vn>~8{I$ji;*<g@Y;GGPjpu$)&n<Yg=
zj36zUa%$4Zo_m}%sEG5dMq^-gx;jLu&TX?TXA$vbK3`fW7W+fl?17*tKA%e@x^uFe
z(;_0D8UU>i2?p^M6`gb4?%O<)bd@?Vz^4ZXNfd@F2ru=LMx!ANLafj<#HWPc<!Jb^
zBrFAs9$H+}Vh>FRJwEl=r;{WiBU(}<QUb?t9Q<VIsB}6z7T9b*PB<LBNUd$dk;t=%
z%1IT^nihZpLeA-QHES0wx@T^&cysRc*Nx%#-Xk*dj=@bhEDds&8W=%zg7E%WKA#$w
zq{(QZFdCKRQK3)>rW8exRW%LciZI?}Vp%(u!==|(IXJG)t<$+@;k!qt<DBqv1wa+z
zagsyo5sqU_7R%E0RaHxK3l`kz&*gSUMDZ~^bAO>6VeZ4co`q-Yz21%M=g<EG*W2q2
zzWFARGa16-0Xi71Vvhi$M{#a2n~n6R(??Eavj@i{sW+)80bGxB3?uo>W~b3$FaZEd
zSXKs@j94tDkTU7lCMP94&WKcVS1?SY*Jx~QG?`Ylnav#wdEQy8*ApW)NC1<K#R#X@
z+k8&v4Zh0C>s|Bb?-ioa2mP7MYux$9rxDT{*RQ{Gv)B8Z@RluXdSrwkPl*<W)9WFC
z8-TZurBX+aiQ<l-Z1$D3qP&lvC$VH&GIUY@ge8g5fo@D1jTIhu)baehSv+4gx3bcf
z_Iis}yFGAR5PIGXg?0~x!@K(hLG#Z@WYHp?zx*P*{hKST)<tswM2~1INM&(sjBue4
z<24x8`Sg1FtPRYMHgBFPHmn3Z+T`>7;9EZ59|K#rlDsIEjE6T#5-D{8*AFL?-G>s1
z$4+OnFXJa6tbEz<4<ihwyw3gGpd-XS2Vk0Pw$9acb?si4OOw`WkDe06oqj=hduLxC
zNl8-GB9rOH4KCMhYb=&}q}UW8z=<Mkd1PW@*OpLdlco;bngoM{5vm2VXLsGw+WPqD
z)~%WXjMtQnM_!Xx5((kSQ0Uh$#bWm(x8Hyvajaa~;~&cf=dFT*XrWHd42a^Py`!Tq
zcKiJytthVQs;s>0>ZYbmi#(pZo{)Er3BsXQ1z|gCOJn7@RwwF&5&-qsTcSA7mrifd
zG*?%bP_Yc7ziIjM$C)?Yn4Jb+Q{ySaoPqJX1fl<lVDS5=bGfasAT~|Ir+efQigM~$
zBC%uF>C^jD!Qcg#yWKxu*VuSvqt%*1V>@(E5cVKtyW#(qI=$YbgHw-);$R8D%KCaj
ziD`ay_1e`u|5M@Eu_=}T(lem9?U6|LKf>YfCS<t>+p^_!`9cnKkYKMUZap$G5}dCn
zH?66z{`yjvt6k1!yAQ|XJ@EPtfOS>t^=+uV)5p{4r!^gr0kl9CyWQXO#^Wn9;CC&$
zB+`U>e(1?y@H<&m?Js-%%Meb*kfQXw9gp`ltLlb%W^;3!&9-SQnd}AQ^`FdSo}0+$
zRi0%l-^*mSYZw?B08Op-cy6iAWEM%_c~lEIno7xko0#}XM3(naHv6(g8ff|?<@)71
z-C7uHS!T6vI4+9&$MgBofF!*(n$P#=RW-%tL5mVrAr@m*e9}tKpgFyrO1(WSNqeRu
z`@cC}j>Y~QR@G53F|otrH+wvfpc&Hkpnw&RBOTIg9~9;|=rI+Ej1g>PsT2T!QAwg{
z6ZssAby^2Fp3F6wh!2VsT{=3>aox0eQdPW|=Q~<>{;G4fE1Xi+EpJ4l2fHdNZl@8T
zdIhW`f0XxWfv-gE%&n*(8vHf{rgEb2&!EALfRfvJo^*qj!CKQcyuoH87BnpvrEc86
z)Kp=#;&9NePKuy)G(^&BHeUlq+H$rYIj6-!BFQ9qK@j$>udF<=)NF3zQN;6&#)cP2
ziJ+7Zx)5%((CH)%m=D$g0EdQR!uivP;B5Rxk7z<Ul6C;2peO(x&M$3jBsW}qG1&!4
zBH=o%u^QaRfoDTPlgV(HL?$PRgx>^ly;xQSkkzEx>#dWAho`6>=Mj~K_^{J5DFNte
zZYJ-8_j~>R#KVEWUH8qI^DM%ry~J+608OhMI;Z<=3$-DXSNeRVl#`%^WGs4~e$P@R
zN|k3hqDon8(E(_2Lj!36U5{f3a-(rF&{RJ3pZ8!GRlD{0&MaO`o<Dq;3}H~A2lNx!
z*xA|A<ngSCz4H!1ZkNvEUkkFs482tXz*>1;dudZs=^_gExnB<t-+ojS^AJ;}pLxB%
zTVb(SSsFrI-waRE?*(=GWkEejl`WmDFs+pgrlgUDx9NGh=-(zdr@p3!T-@GHzJ1wc
z<jNH*$mY(@2Z-O#Q@Ks$I*o{^sv?a4Ahj`5Xx6k;SO4lFheM~wrXErJ(*u70_1hv5
zf4#}H`k}_gtt)Ld_l5A13*J<|pc$Hib0GB=!$}vmwUIlnyY7MJLgAW7e}72@(_BU~
zrOkDqEF7l*7|)!EuQ3{baaTvj?px-~TT*W}(@onR^83H~px^(O(Ohor-3<+gudc1V
zM5W&U0$&195Ok_@S5@8Xnw-2RvTxtibcg3s3I9GK(U(f?E;rRF04U(G;l94WT!vYD
zTXXY)yW89EzryRa+l<Dc-O=bRx1KoB_4kpHo~lCOi3?1or)!PI)f9;G1sD&ybg%2|
ze5`t6;+LVFJBflcE6Ex>4}y-o8jl|s&gJ%=s|dJvL{Wggh}vVZx`H5BF7|ltTef1w
zwZ{{Q-)=p5@~M{tfkRJ)!-t*?hriP0a9p>><9Tq6*&M9UXm+Pn^%V>hBmZqoie<xD
zj^kPy8oqI@+kLOOudi`@|Nhb&32Hp0bf^JxFp-#iQ4k&|p4XeWYJ(vUeLbdyK+1v!
z;}~EJ7E4p7+x^#tt5)55O)U24E5pOv_WAuidog@qReCg<&NjP!xv!#PX@k`|X)G28
zz|rsPST=|{isDm7v8!ia2%KNkG%e`c4Gi|C`99wjOX})w^+cmx@n@bPV_>FI&Vznw
z-b43L<D<}IKa9!pTj%#C&I*)?R4Sl=lQk?`>cn~U1qqGAXtOQr@_3f5TD9u#O|7ll
zjz=OpclP%m4W-k&_CzAPNF<`ga8m2gXsR7rZM99Wug0*R?TN+2U?ww6hce18)XQpl
zRK)`rq{_lMwY66?&zg0;D;{r4?b$=dhK5RB*Pxkc%9MNxDYQQxKe;^|zAKo|A1JHg
z|L_Ro1kwhB;gSm-j)$8}rj|K)poQjL*?Tn1917dyc4M<s6%B>~4A(tLRqY*5CI=4;
z4vxmNSz%#KjWirVu;JN2B*KDGm`j!{DPpp!(CT!xn^&)%7f&Xe>#WueizKzNfq*G9
zFhJ516ZAnu1Fy5?Vhw?6A(a*Mp{EYT<G+U*9{4ch$+_bmD&0eYV5t7u60`ZjMx)V&
zu1Cxi3~pM=Nr2^`Q}k#?99lnvs1cJ%B?d!6XEch*LLnowYz|DNf}V9C0<$Vfl}t8U
zAqxUw5!npwxM*nf#TPidv}k9h%@0#riD`}`ldmCd9u4GjFO@0tBQ**0A?J)J&?a=_
zwM{&K=>n6f4N-Br;USuCI!aw<UtG}{6^jBR^fe1UO9s)diR+X_=&V8C$`M4Sw3lAP
z9xAk`(UjXKso~jdxIdFQ{BA0>1Da|-O~0~?|5(CfK7lAI5P`XvfR+J7XM@q$ijl4X
z1Gd!;V*!*HU=&R^8h&P~O8@;vue_A<<d0M+4dijGaG{VG%jHHO+56CUj*LlCcS=!)
zuq{=d`lco0nNPubI&5}YIBqtKp9|GE&#BcmqIjzinM$xv1q#@J0xZ2cL&sL6Vo`!L
zM>Z=7QBh)Gkx&f7d{mZ)q31^cCIEoZa(*l4V4nWl>Ce!6sG$Zd6TELiVi;k(o|!sN
zi(dhVLXm1c04W=pFE8bsw-ldg-e5k*X3CTeVm_vC&HM+)41gH`GXQ1)%mDaYkADd;
Y0PLhRL4m{CQ2+n{07*qoM6N<$f+4Z0kN^Mx

literal 0
HcmV?d00001

diff --git a/images/mdn-logo.png b/images/mdn-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..84a5ec1432ec26df1fce2b69eedab564b2e0a7b5
GIT binary patch
literal 3835
zcmV<X4g~RuP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU=ok>JNRCwCFS_yPj)w%x8aEEh;+>8W7
zrhqaiqL!qhT_QNGr=V5ARkUvbwhvzGst>Twp+ynY#ZYOfPwE3)Z?#2GgetH)s3j88
zXK0|Wh?D|~B2YpgBq6!;8Q-_h&5Z$alMuCgtrPB<{{0W%|NZ~o2gz|9bQ~}K*NfP*
zXAdeXD{<u&S0a^8l|>?v+57hG>l2MeA<Htp$|3X#1Oga4c5LIRQ>WILrg`Y_;ln5^
zD?@2%DK@{g`JCs~T!Mt6u~_W(=H}*kAAkJuZMtc~;WZmy@sK3MlS%x!widxa;95=7
zmP?ZKyIhZ7V1S}1P*oLrI{l-=pB#QZY8g;?9#Le-5<T=)>(9gHB(0{7=BDI?kgQB#
zRGy$im!6N7P7P>mYy`bNH?8Z>n?4V2R08-x+>6UncDKrB@B0}hFICYwp)O~xJ5okD
zr%g$m_xpS!jsz5})O5V(q~UX%C5B;`;c$5Q1<#&u)g5=-F<{@{_8n+3jo`hqhSjGO
zcugDW9(d2|PA=h3Aqlk}8{e>0T$Qj9FkKTaP&nO<ESph(q{POrr8o*bKC8T<V#ubA
zn~rxGfisO~Zc6BSu&>91XB$*VriEBHiVGors&+_|@j||d*Oj!ZsYW;!M1T>djJqu_
zDxx-`s)S7;2jk)rrnK5QWgEf>%f^Cc1^-*>!)Nih5^aq>$jeK*G{EQcO-WcL?ob1`
z)Nl~*LUF-I0UoFQ3YJD}yzEKf6f8`({g|EdB1L8Y=IGd|TKG3_3|g^-5Q!jUOL!$B
zAQ`|^*ND!+sq^TQwsCt(#Y?IpoIASP93Z3y+tjR|<AG#bITKANo>XP5$p>EYr|_X;
zpiEM+CK1AS&jKs*ZAg}b1&uN)!wRed1^2`x+?bMaxgp`9A|2n3#GxxeJlJg0QBDps
z9OUta%(?38>+Nn0uq?|IICiAYy{@^gm+($l!s3vDT1j^!G20H{M@<R_CM_g*{{2QF
zJd?IxXBdAQm!a_dGmnGUyaw*3A*$rXcS3REosl>zC@zz0Mh<cyop#ScxrRr;iwf)t
z$ykwR;`efz#@ZN6ufG`Aa9gW`v|}OZ8p%Y?lkmQ5g5JPLTfu!%U{{`uZx<TqJLXEL
zi4>;qJ_3{Ke=D58dd-VllQM2iDHtXgkK~f*fnIV?9tgQOmoc~0#^n42wmM1p2@e6a
z8M>DqbMR83<9fqpsK0lKgYQvM+slYJ3f^b5?(a`nl99Haka5X@qqyvJ6k#HC<rx*P
zM%}n#Q7DZY`=oGZUjrM86a*o4Yk=Avv$tvrUM9{3C)YE%L##4=$Sx`VTO`r52?cS6
zK4MAkbU!5RRm%o;)cH`NXXtY}bK=bc3E%2x;f<3D)*nnTL1T=lj1+78v}WM`vkDqK
zDr#u#vsw!O8i*54LCk2h(N+2E7D6d{^cwQ`x@I53jt`bc#@dL4|Iu4<i>YEr(q`p!
z2m}XvS$x)$iB=F&f-W_~cITG)=UysV>6dV4iH@y}J`74pZrTb35^nW%5TU{MHcF@}
zRS{Pm%nv46NBr<Rc5e-k&?l;6a5Mv^T|o)YX=&8Nb&%RIGp0gyGF&bSPc^;gB~A7x
z=ASMw@XLhc!pmUt9rH=Jg~_}+VqkKijd4uio8k^e#cT}W?>r;xX$LoxHoxKV;yo#i
z9g4^jx%Uwunc@IFw}QOAPEEmN;s&VDD2lCM#x^h_ek0={!Cb8t3!g|p$-!<KJdQ@J
zDgs)(5{gJKB6sQ>6Kl;hs)r9km@qVs9K{4i^NNIna!JGFs6(Q&@gXBEJmd5}2Y{-+
zKKwVct&WOc@Ax58+HNC_ayB_WYCLU#jb#lAM#N0q5VzrDzP!OG&1L9+LXFjkg8~{n
zi#1?+n25Ioa3m<HG{#>u7MBel4wDAI|9^kMo_Gw4|NeIjjp?|&C5=O&04CD`))z70
z+D1ZwobGj0CLKLaHkwdi;(%&H;lwNd0py#4`z4HtIrwJSkF|0FDxaGd^+KWHO+Fdl
z4JB}tp1+5M>k}5ePs2gH@%HcGefJ%Vziu1`7nh)9_(%+%az73n`4o+<E%@WFeu=44
zK1t#WB(Z>pCelq-uz`KeQYKctX`qEn^cjo8<tfMIeldl`iC$pkZ7%fUH&PPY0%=mP
zj5B1K5To!?GKlGPMpW_Qh~I~I*%Q6bEUB&BhSq?_=vWvzqzwIviqVIQmpmf#1{T2I
z2Cd#3Agb>6u#BZ)6Mtm!@{o}<LepUKe!w3iQ|I?C4!&l4uwBtzdKHJl>jPCETKT&=
zqT*UY?J6d)IDW`1JE8foBV}P9wW&UE7&Y=oXf+I!YatA8a`0yG3)F%7uonjkWK1+<
zOtO6N(~}2TKUX<1Z1$U&>N14WF08>TV~bCR#u7Zw3E`k*;jc7ppUtLDvr#Ck7#d_h
zL`dFhdQcv-FqriDK$2czWLA{;uuzS`QoXn<sX$@9aU}GfM*Fqsc(|owA1`Ag6ZKaC
z8T(nVnmm4l*|l12RQeHf<6}$5RaEdl>&f$+y^-GEL!~!p2HvvM_>@oY<-6;ANfgrH
z%VZBGS{_uBHh1#+&1}6NNqBK{Yu81rM-UPsL`%)Ogb%31;)sb#*2oYw{s$K=RiwK6
z&t%{unzd~a@w|-+a=Xf$5UsLi0=KkSxIW>*-hK`aa=G}Jt|36({@}N8kOuFTbzDt2
zy%rDR?iR5YuzJ)B^{AN>o~_AOv5M^k3jxNd9@m3n$r!V3yk4l_wBq0gG-MkU2{KCe
zMBUY`3ozjXQS3q_gz@Y`ce5kSr}B@Uk?@G(!BMWc8%PLOvN{);w(BsXhfQXW_DF<x
zzjoHdx;h1$n>0jNe41FOrdoc?V2d!AOjJ%P`iKSZBVv9CJJc(9eo~PTm8Ew0i6zYS
zY1R+s(PrjD3&SdtW`{EIZ-|LVWvcqcY#j7>lSdRVu`BU-kx3jUFk1FvS))oea&Qg1
z%yDc9-Xh(dW=lPeRkfI~d6{m0C+K9>5N&JV8(Ek}F+V<JE*xScJZ;`iwMFV;M~@8<
zOtv;(!b&yiGRg8*ANuH)JGnS4NycBimTRQ&GMjBY!stw<OOx5f5|08V{1{tBE1#&!
zm)jOSy&rO}?Gdjlm}}U!V{eEJS}?`L1YSsLnAqaDI}n-sz)>#fYq<6uNuS;qlijzA
zx%Mp}3k5sK5fk2(kX_IJj`<=svO>sx2pz;i%DI>%_VMYzI%)hol)=BsNj8NIG;lpI
zlw93N&o2+Ljc)UvNb<eDG@_=7O9+oOJ_D97*MtsEP+q<x;|OE7kSrE5bHhi7sUd!S
z7i+*SCxso6&-q_$R^{=m-ZJoXSU;z@xDn%@FfSe>P@dwFvnynfun^+2!Z|+)q`E9r
zPTSo691p2oLC9-oHe0g`YNrizLeXqYFSyV1u+!O=r*z>$ozJozy6|2HnddL;FRBg*
zK^6;2R-o7GMaP{yanEKQ5F5ebaE;*o?9p+g)0us^VDR(CM!YLzi2Yb`bevP<hSDap
zS1hFKI))7!hUy*Fc=w%mF?{$4q>{<cch1;sm6Vj=?LWMY>gsA#R8)wKC(N7osQXUU
z_9|3WRbfZf4s74P9c$OVifPlPA(cwG3i^D0Y~H*DTefULC=`Op{1HYD=lVdrQ_W-S
z*mC#zUR7e@9Zl0Pa^y(&e9oLXnEBAm_GA)*AAa~@v5)Vb=jG+WG)xQ}H~=F?jJQCa
z_||auU3a-g|MaInbCn)N+4=eTc<iyq@#v%T+z4xo(5O+P+GK`ZJ$hXSI>KPelqtAr
z{CFf13D;92IQh((51nJMNL=AbF;3RkW5&#xnD)RlJoWTb;#-4z{mCbu#E>C_-3Vr3
zHG9@9Oqw(a;sXjgDBPX$7qzh^kT`elJXHUw+MRsPf6RgA_vd_GD6?hDX7|~6JdOdE
z4!|rbDsrH2-@alC|C|J0wrm+{cJ6ec`;}B;F>anX5x3uVJ4TNljRzlipliWQK%s2*
zs5@ELX=Jlw(7-`hvUmxMwg~og^f&?n^L~1K{*UJ)nM%4|Yiw#lUN{Vo$J6cmS(fQ+
z#JHFb1w*b=n$I@3&-JB7VAbkXXlQ7_m@#8;-Pf;k@%!weMH$Nbg5$a8o_D_tiSh5V
zX7|V;7j3}q-MeYT>h|;3UVq)iY)?GZ&h0tI2YWxjkLS<NK!R(7uA<dz146{{FMhES
zryEYYjIwCaLil|?bVb7=ky~3^T}TLi&sCKL3}1O=4Yq9EdePDA>?>ubc_G4jvhE}n
zFInQU&++5ONQXmm3N9`##xu_>WNk3e|I+@La^F<<x-h7&uFmyzM}vg?#~*(T73JmV
z*RNk!WZ1O<kx1kOy?0fXN!ktLgn?iH>t21ettAMZdtZdzaX(SH=Y<6Yn9JhVafll6
z%)*5@cI=o-rP;PZyekYie*8EVELecmZBP~0vy3Gm$ak!64Pe;U(>wnnAkajX*|>3|
zYxk$0eBxHhtkS}Rg3Gh_Pn<XbEuf*MrX~Xsr-RS<TQJs}Z~g|mYHQnDhYcGxATN^F
z9uZ;C#!VYBpskvV>)C`B`V1`_y1(1ctkY*q@6X<5KPzrToQulqw$p@-5Z3W|AvAkm
zv>ieTfp<~7I!k2X0AGi^5d}_M&%T?LEo5d}8F5|wW;7BsYFOpA%9CA2fRmpnD=Yi{
z{{8#cxyc&}<t#uV8t2~^3i`T8?sJx@9XivFvc><E=;$QjkV$t=div_CuRhr=gi6FF
zYjMeXzF2bT(4l1vwKvNe*>?G#F~nR#c{;;kUOrJ;TDrWbsHl4u5()}@vTOV~>9Q)B
zNIscJCMHl|QBRtyFG+caUO&U=?i@I9;8Nygt#0U@){-vUY2t4$+uff<@*@X{!9k+Y
x>TZGYWem>ckU%~Qhr{nN_i6?8<{JMmzyPnSmM-ot$q4`e002ovPDHLkV1j);Vq^dS

literal 0
HcmV?d00001

diff --git a/images/w3c-logo.png b/images/w3c-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..6edfb234b3e49e9544b9cf752def4eee14279454
GIT binary patch
literal 2561
zcmV+c3jXzpP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU*qe(<TRCwC#S$T|AR~`QD_THQK=FJQY
zGYo}7DHcd-Y-wvNQ7Q;Rihxp5)5dD7l|+O6!)Q&kHZJiG{^@GfG-$Od(O8hOmBqHu
z&RANtWors_ScQ%Zv%Q&l>wS0eJLjJJ-kkyJ(El3WO}?2s=bn4cZ~1=9xuf~Mj}P;u
z<3oPc6sRdsQ=q0mO@aS!1vK3An??M24K(Uf%pXNQ+W}FW6Lmm34Fr|?Bk=qM{O!Zj
z1~3@kC|;G9c-))^l4ahjF;}|^C3EQ&$T7rqHo%N~IQu5B_p#`+Ndz~*;HY<6#JEX8
z76aZl;JZL9zKe@=1gcS(va8h8u7>76D#i8nF1YnCaIjEW$}bWQp$8iI=3L%98fZ7B
z>oo20R~Uwep|0ro-NY)QpIAryEAs4f#Oo$v<(()S4=O<yLN}UtlToG&Cm&X>NW*ky
zq2<CY@bvb|Qm#iE#t?Xg(+qtj6;59f7liP+Uf|eE@-O07#Olb5`-$%mPbjbam{_Az
z#y5D=txP$N-naoi1rji*fK?Xgh3<D$mddAAA~PNp7_@xa2I`5F)5yqLTqWr!FX*25
z>5L?@^(2fY4~MovDgk_Zl<=Waj}!BVuMyLT876s~qqI~)TcIYdVm!PeEoobf3nQ?s
z>HP%>`wq$TWNsnMlE(W$I)}fq@sMtFpldCGXUtxd_0OX&I~c?VG1x#Q3x9;+-zXX8
zx$SV>XK>*-&?&7yg?K0;_&*2+24)fqi9Zt*3?<^Ei3~k$xtqA?3b~2qErAD<dpYDX
zg$SA8?BzQoyOtn*W}=Xu#`&k^qs9RsUJ3+s&G~T5;1#R94@vhm*nVL765)AEso;&0
zks1T9XY#`+G<fLT%xBUu_Yh5rzk=G2jf#oiiWEcqg4kvvL5k@9ZVDqJJt^G64QBA~
zW3aej>p2yex(hq*D_SHlzGoRs_bDlKfdXd}ftyWjWtgD2#%?(DV2K%Rm>x3i6q<66
z!#9HXw!HP2{oX4WI6ynU7z!C?uZKqo4`qEvDe*{92VzVnM)5yX|D6ige0o6>2B5`q
z6f8>t3UR@`x@zDW%TW}mR|`C9GKfuU7KQ();!*)6W4oM_qqI2+?IzZ6%j;AH>Sx0E
z5%~lh-%qh@F*<>`HAotPfS0&75F*A-1<Ul3u6->&a`oF~zzKOg{Z8~Tp8FY~E;sO#
zB2ZV2SjN}qz|hi?jk*eYc(=(lHL2hs430mA{?;J;CiYLkgn@??O{q}&33Rue#u@I@
zc`#gcnqtATg#A7_YhSezH<CF5iSi~c?n&1g-c1-c*g{Yy!E3#Voc;7gg~Ziw2V+^z
z5p_fJ@2nIz!)Zrr53>^!T!C7;^*^D~4f45Xy~&-|B1tx6>G*-;;hGcG@7-f>CF+=j
z1Y*Ubw9L7{`(B!~`8fI*ON~^bF>^hIYgYU(A*@iE#th?$7!qZIuJq?sRxTM^WSum~
z{np&ANagMetk1cQc@*YQ3JvF3<4Mu+lf$>@ZU`BUj9r2AZBQtoklHIZ5F0h*zlatV
zz%u_X8!Ibs*p>*aJ{6?%kY^F_bg|MLk&hI;P9od*28IO<n>E;}p9L;Luy(BYCDN)B
zj{bGT>w&q8!_LH3{CCE#KvNbKSkA_3KZE%gXo#U4Gf0u8YV$k>n|}_+IuaBpW~(@6
zD-YZeDPI4?gnk=sq|f9t8WQ>Gm32cUG_9F_T!*gu`*GsC9Q*{7_0L{eHyRW4Q7}s#
zm8Qw?rlM(RI=sXrT4$ze{f;5#biqz+RV=dLTFYe*r1{IM8Oq-(bH2lIKgPJymT>fX
z;xnB4OBri27O04oe-e}XW?<GWV&nvI^a|T)0}+rj+FQzs8jA5H6oR~F;+A>aegP@A
zNx8ZgtBo5LFy+qX&9!RH42q4rQDR24>%&&!B=HXK_n;JCLl25xsVqHVmXnxz<N@4#
z6^mhAMr9a%><XBqTNH-7x#H$z;V#q<eN_@v6GcJWgd{W8l(P(Y|KEzZvstX}MaW{^
zJBXI^J(x%~jO)Ru)GLaaNV!{>!PZyf%2)zxnuSRsjBu#3)|eFVXrU;4e>=y^%Eg~#
zfPPlZJ&Qu(Fl<q<`~rKUZAz-C6#BtPXZAOg5<&G9zx@%X4|<UUanUGZM^!O#-Y8##
zIc&#bb@^x;{J#}&DNq!ib(+>c5!o`#9_<v=hDWO9S!>GHmdYH>kA)2rpVPXc>Kaus
zv`A+vD!hc>9g)LiAJl>-_HoxOxS}rHl<o3})|Mv|SKmp@9x?9N&%xowhRE$w-nVGQ
zVR=TVzRMsl9F`eVC|cA<THlLm6S1;IZykER4xM|$h7KQ`LXt+<G-_T3F|z|n7NwXO
z#(WQDX&=dPZ6AY_f+s}vzW6L~@sTiW!5!H76tX>2kslbV?6(u23W`t^!u7ttpPTnY
ztal)2z7SMh-3b7H!$=Ezo1|SeEly<?^IWlmfqPfbed<AC@bxgDZ;oi*gGBl@-Ygqq
z2C~!<bD4?m)=NzoM#J#mQCIwe+|=_oO3#FnYLz`Y6cw0e{qw95ugaxi+{PArmyBS|
zyOy!Di|KesDnCTJ^d~1`THoplojk7tR<c*sphwh+?ES9as{>Ao&D;<!iAq)WZD`Jp
zO7IDJ9WOWsyROLZZ!0$LM=6<Q?GUX8Pf`9sm0@PW(L`$g7_(Xu_2ucfI{OS4Ypn#f
zW&Z(nQu99%qM|*ey3)~Cn>rKRt*Z9#c&N``?u*MFTH0shbqbjYrz$jw@lci;3_qc`
z%;_7U>o>5A*$USQXqeE7wDz~?wRXkv`TTh>ID5O}Xoy(ld_3Ir96D!g#jx=3(<038
zRYqA6`4S<bPNefM6XR4f`4w^0G;yKra&GEEbLIqd`AaCLyx<*`Rpa?8mo>c1Bk2!N
zOz)Jf!4Nyx{d0w7J23av)o45SGz*<Rs$EujNN;D${!O&8r9O8e>_N{EiwNPhpI$;P
z_B^<c*b}7D37N|&;Ik^Phgo<XiS9sY;cii&GLxcT8Q#VC3p<e>J}sZ8nOP6;P&Lff
zzm)tna;f8p7uHhYoA}&PZ}sxMXX&jUa;&I2fau=hONj{bwd(tiNYw=ubKh6qRCU0#
zFZ<DsG<hENxo$Rg6`fEjh^7zK66@0f-a3eXw#j~p&zt%J1!V7U?B&__0XT_8<oZPU
zH9_;<=7DE3Ji*7yUhfg#BVJbAA5i!2jx1ZXfAZB7s3}lWpr$}gftms}1wQcgUjYUH
XmD|E=izSX900000NkvXXu0mjfKV;~>

literal 0
HcmV?d00001

diff --git a/images/wp-logo.png b/images/wp-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..6068ed94ac07ff170f07584f7111074466ae6916
GIT binary patch
literal 2542
zcmV<K2@&>*P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU*kV!;ARCwC#T6=I*)fxZJxsSbjcQ>02
zQ6NhKNvJxMnfgaZ1gW$YEJ~fWgHHQLmCjU(j9Lc7KJ2^Js#CQ}%LumO)afwVO0o2%
zZJBX8ajaAXlAwVQAcT<T=CPa2?%loToPOu-O;~rc$>zbM9nZ{f?!Di=x#xR7?uG~<
z;D33M{~H0UU6r}_mLk4@n1eWj_$%TqL{SoJ!iLjo7}l0Q0~{z2n3SUA-nStnQ|*X9
zx_ghV!)ul~N43BUzJb_^xFU<T5%FWhGZ$E?a^G(v%Cl%+MLdRhGWTJcbFCnDARf<Q
zUam64(}<l?!54sWsmx~)Kg(er-0LUY`|5ZCJb>7cLt{DDUvn)q)9XRRJrnGGkNaH7
zSOVOL*phX9+V#VQh&vFcvhLkEhVau_0mQvId#^>*B0lF{XS?#3vduQKK7*K@b-fw!
z=d2eFBmUxES0TcPw!%CKP&E#=t^rN4i3F%X%+0#~I^s|6d8?Z^_GLZ$(XlL0k#(Lz
z9Ld?F5s`Gyy>3htTvVgb@va6}y?Ge8rcNY)H;Wew(U5b$-ldPkX`oOHj4U0oEQfX-
z!YC?*>I@<g6aG^-50=0F8kF^PLt591bteyENe=CLmktwUq3rdv8_?IfvGHs%yDN%-
z!KerJzE%UA5+HUOZureh;2RhKt|-L{u^q7q@iEuue>q<2DzwVolsc(Jset|es)e&1
zez>w!Kms#vsJ#O|`RYFS+d7PW#)^5(ELVXO?>CcqP}dk7Yng>82g9&O>6T%@N1B@8
z>gFa$74J%L(FNd~z=0$406izCVUar#xUQ}a2;+E7E<XWu4BUoev*Bc02sD-DW>l~>
z4d%48LhZqNNPD!)OaN3UPg7`WtU%?8g3mC8!c}j*2U^kwF+*0E5do;mA=Vs(RG$Zk
zA_~<t;3|bcPZH)f4gk~X<s*P#1mbOepf2+i{hd-OnKmWlx#9)}M=O-K#DL0Jn4u1E
zdK$oXA$}$RsR6^$J~FEg#-m^E=#Si;PFvM-+|YDSD}?;J<_63cxJFoMTO6)zibCh2
zAgC#R2?db8Z&Qdil{%RRm8+lY?fg}5<lJ43zR}O+F>WO*4h;=1?JFx=?h99M6bemL
z9*jWm!aycNiA&@{()Wj2(Dx$-2!#Y1+dKDn^`5&+L6;#8^TOed;<-X7wD$I_JKKI@
zzfd6<=t@HPNIx)*UZNOqGtbb;02VMo8~XU}qg~PEI+{U_sj8|E`h39`eP-}QMb)B`
zrYIW3dXFznMVfaCT_@$uQLGE%(g;8l4#_SP(t{o!QON7>bR|A3wJjOdHGQ~tUhSuX
zfwFa_C1vXtRxVtDv>|y<S|!!r@<pyH|19ZD_+>y(CnM3RYG2rt4Za^jKM{MG5GxaD
z=EQ*z9Q?lEKRmkUkm9%zL4iDn{l3z_%X{*Vg`JSD^=YgHzpFaX3rdP}K`x>In0Z9J
zHDFpj#vd^Atjd*+bMBKzkEVlx0}V=rH0H}h>_~4R>jJq2t*{U4f}iWk#SuWJN;^)|
zgYO4lAgcJhlgf~vGOr4Z3#SIe;sYzY2m3Zim%#ug{jq_KNV_>x8#quskR=4Y?TY%y
zE|RounZ_<?8YQaZI?%q)(3wRSseZS@BBR&O^}>P91fDZ2Yz#WPT6cI2^FDb$VGS?N
z=v~Ov1$y~4vii9kP~g4stF1lt;Jy7?Cl|vciX5E`^DIH&%qs@OPEd5C^VuVf`_-aS
zZ><ghldqJ%k4PlrixXCSv6E8W_%IjT1X@WI8p0lJF+fv*HFkpa@*(W{7)-_zw77gP
zoOYpopBH-`1?U*VT^iHjnkpS`UJ!ucv~c($ggS7tlbr-#^(rvu--yho^Iu@7U>`*x
z&=N9cq-ADA0D`fVjwz^lWWEJ^8m}nSt3lG{uxg$MR#gYV79#~#`WQpTSAaLX1O>4Q
z@8#9NMoT1jzYAh0Rg@5Pe76xY=Ai9Wbem>$8-4tu<0MJ^gF9+Guo{IJM&IJduvxPb
zu^L6;6ZQ?ngUR5%F0l4CWFDPB2s)n6+o<_A)co*S)Vxt##pJFfR)#gWX?}niRV$b`
zyv%VSDDq3Vv;;fe1J>??AY#_IF+mGv8;qqhdklz5pVuZ=?z!_~2CHjAo6D*{u?1_u
zq&qf(b-`{#OT2PqG+PxVKt}Tf+V*%M(NVnS^MnxaNScdZpbu?BM|@&R1>e+wpX@_R
z$e6Ik6oTdkEXUZ90UJF&dCh07hY;UAAKuOf+3!qk*j6&x>7~P%$3>ny(d>Zbmejln
ziOwv|izzYx=os{$BECPlQBRD<1aIvJ>$e91EF0ZR9m4{gKzE&fzDNm|s*(g`ifu9L
zM+KN4Sq~$AI3eHYf3l^b9yKA4&aX()5=~u@dgBD}fkeIlgGV(Os8=1$%jXp@IcCmN
zKduFpDzj3(LGzJg6If$IG0eF_J}@5hn%`&+*34e!nG>uGR?l9d`;23fP7KUW4IPlK
zJDD#)_nSthJt3Jk%R8Gsq?&LDneNpB@NaLJZXJiIM-b0V!a1Ho{AA3)#b&T1T=t-D
zdfrAwMl`Sfj;|v0ElHRCh)6MDP2D7~nX_YJwA+=zOjO$H4CFz9mDr)4l=KlHv(|dV
zucr{6-$QhM;KQvPcvJ;_2Tt)+8VsMu@m-=Rr-_{Ou)fIjhJ_~I0$Panjkt*HvzWzi
z$$VuXpqfr6w#MndNJdM<$p+%_DKek^75XtbFH`p;0LQ^dB+|F47^no>Zxsa+aci}t
zJ9`r%&?>`u7BI@mZkB+xJOT4%|22G;{Xh>XRf-qhwj+FHI?8X)^kq^@s<hDEDDd;s
z{-y-t+a^^`c{P1!+_D^nMcX0|>v8`gy~KDUITTx#?2UazcC<1MRG)q-I4gJ{PXMZU
z4jSd^qr+{<9hp`V)KrA6$5C&+ye9N~X46Z}C-H^P&%}@9PB#tYxoThVn)+1tW|DcQ
zn(T?*DIuSb9j)wd<=7bxg`NuP-k0-Sh$RD{nEst+mAWabA8`73r<c#n7{XU+Y|;Y8
zRwvcX(6W)~3eDUye?i54a<Jw&&}8<_%oRAII&NE0J@@_^?%f{lVafc7OgN(zYFF7N
zIPFUH+xPO6SRk0th(;_`Cug-%<>z>RkDU;Ckv#oR^8!Mpf$dDA-Gg2I_otGnD#n<H
zDr(9w^fTpUrQ1pZ=I>b|^?~1B$%p^!@u2|ITmKbc0N8ffsT(-G6aWAK07*qoM6N<$
Eg0;xa>;M1&

literal 0
HcmV?d00001

diff --git a/scripts/data.js b/scripts/data.js
index 4c0b9f02..698644b2 100644
--- a/scripts/data.js
+++ b/scripts/data.js
@@ -10,11 +10,17 @@ var tests = [
 					}, {
 						id:		'tokenizer',
 						name: 	'HTML5 tokenizer', 
-						url:	'http://www.w3.org/TR/html5/parsing.html'
+						urls:	{
+									'w3c':	'http://www.w3.org/TR/html5/parsing.html',
+									'mdn':	'/HTML/HTML5/HTML5_Parser'
+								}
 					}, {
 						id:		'tree',
 						name: 	'HTML5 tree building', 
-						url:	'http://www.w3.org/TR/html5/parsing.html'
+						urls:	{
+									'w3c':	'http://www.w3.org/TR/html5/parsing.html',
+									'mdn':	'/HTML/HTML5/HTML5_Parser'
+								}
 					}, 
 					
 					'<em>HTML5 defines rules for embedding SVG and MathML inside a regular HTML document. Support for SVG and MathML is not required though, so bonus points are awarded if your browser supports embedding these two technologies.</em>',
@@ -22,11 +28,18 @@ var tests = [
 					{
 						id:		'svg',
 						name: 	'SVG in <code>text/html</code>', 
-						url:	'http://www.w3.org/TR/html5/the-map-element.html#svg-0'
+						url2:	{
+									'w3c':	'http://www.w3.org/TR/html5/the-map-element.html#svg-0',
+									'mdn':	'/SVG'
+								}
+								
 					}, {
 						id:		'mathml',
 						name: 	'MathML in <code>text/html</code>', 
-						url:	'http://www.w3.org/TR/html5/the-map-element.html#mathml'
+						urls:	{
+									'w3c':	'http://www.w3.org/TR/html5/the-map-element.html#mathml',
+									'mdn':	'/MathML'
+								}
 					}
 				]
 	}, {
@@ -36,15 +49,23 @@ var tests = [
 					{
 						id:		'element',
 						name: 	'<code>canvas</code> element', 
-						url:	'http://www.w3.org/TR/html5/the-canvas-element.html#the-canvas-element'
+						urls:	{
+									'w3c':	'http://www.w3.org/TR/html5/the-canvas-element.html#the-canvas-element',
+									'wp': 	'/canvas',
+									'mdn':	'/HTML/Canvas'
+								}
 					}, {
 						id:		'context',
 						name: 	'2D context', 
-						url:    'http://www.w3.org/TR/2dcontext/'
+						urls:   {
+									'w3c':	'http://www.w3.org/TR/2dcontext/'
+								}
 					}, {
 						id:		'text',
 						name: 	'Text', 
-						url:	'http://www.w3.org/TR/2dcontext/#text'
+						urls:	{
+									'w3c':	'http://www.w3.org/TR/2dcontext/#text'
+								}
 					}
 				]
 	}, {
@@ -54,7 +75,11 @@ var tests = [
 					{
 						id:		'element',
 						name: 	'<code>video</code> element', 
-						url:	'http://www.w3.org/TR/html5/the-iframe-element.html#the-video-element'
+						urls:	{
+									'w3c':	'http://www.w3.org/TR/html5/the-iframe-element.html#the-video-element',
+									'wp': 	'/html/elements/video',
+									'mdn':	'/Using_HTML5_audio_and_video'
+								}
 					}, {
 						id:		'subtitle',
 						name: 	'Subtitle support', 
@@ -88,7 +113,11 @@ var tests = [
 					{
 						id:		'element',
 						name: 	'<code>audio</code> element', 
-						url:	'http://www.w3.org/TR/html5/the-iframe-element.html#the-audio-element'
+						urls:	{
+									'w3c':	'http://www.w3.org/TR/html5/the-iframe-element.html#the-audio-element',
+									'wp': 	'/html/elements/audio',
+									'mdn':	'/Using_HTML5_audio_and_video'
+								}
 					},
 					
 					'<em>The following tests go beyond the requirements of the HTML5 specification and are not counted towards the total score. If browser support for one or more audio codecs is detected, one bonus point is awarded for each codec.</em>',
@@ -120,7 +149,10 @@ var tests = [
 					{
 						id:		'dataset',
 						name: 	'Embedding custom non-visible data', 
-						url:	'http://www.w3.org/TR/html5/elements.html#dom-dataset'
+						urls:	{
+									'w3c':	'http://www.w3.org/TR/html5/elements.html#dom-dataset',
+									'mdn':	'/DOM/element.dataset'
+								}
 					}, 
 					
 					'<strong>New or modified elements</strong>',
@@ -128,6 +160,9 @@ var tests = [
 					{
 						id:		'section',
 						name:	'Section elements',
+						urls:	{
+									'mdn':	'/Sections_and_Outlines_of_an_HTML5_document'
+								},
 						items:	[
 									{
 										id:		'section',
@@ -163,6 +198,9 @@ var tests = [
 					}, {
 						id:		'grouping',
 						name:	'Grouping content elements',
+						urls:	{
+									'mdn':	'/Sections_and_Outlines_of_an_HTML5_document'
+								},
 						items:	[
 									{
 										id:		'figure',
@@ -1022,6 +1060,9 @@ var tests = [
 					{
 						id:		'attributes',
 						name:	'Attributes',
+						urls:	{
+									'mdn':	'/DragDrop/Drag_and_Drop'
+								},
 						items:	[
 									{
 										id:			'draggable',
@@ -1036,6 +1077,9 @@ var tests = [
 					}, {
 						id:		'events',
 						name:	'Events',
+						urls:	{
+									'mdn':	'/DragDrop/Drag_and_Drop'
+								},
 						items:	[
 									{
 										id:			'ondrag',
@@ -1074,6 +1118,9 @@ var tests = [
 					{
 						id:		'editingElements',
 						name:	'Editing elements',
+						urls:	{
+									'mdn':	'/HTML/Content_Editable'
+								},
 						items:	[
 									{
 										id:			'contentEditable',
@@ -1088,6 +1135,9 @@ var tests = [
 					}, {
 						id:		'editingDocuments',
 						name:	'Editing documents',
+						urls:	{
+									'mdn':	'/HTML/Content_Editable'
+								},
 						items:	[
 									{
 										id:			'designMode',
@@ -1098,6 +1148,9 @@ var tests = [
 					}, {
 						id:		'apis',
 						name:	'APIs',
+						urls:	{
+									'mdn':	'/HTML/Content_Editable'
+								},
 						items:	[
 									{
 										id:			'execCommand',
@@ -1142,7 +1195,11 @@ var tests = [
 					{
 						id:			'history',
 						name: 		'Session history', 
-						url:		'http://www.w3.org/TR/html5/history.html#history'
+						urls:		{
+										'w3c':	'http://www.w3.org/TR/html5/history.html#history',
+										'wp': 	'/dom/history',
+										'mdn':	'/DOM/Manipulating_the_browser_history'
+									}
 					}
 				]
 	}, {
@@ -1162,15 +1219,25 @@ var tests = [
 					{
 						id:			'applicationCache',
 						name: 		'Application Cache', 
-						url:		'http://www.w3.org/TR/html5/offline.html#offline'
+						urls:		{
+										'w3c':	'http://www.w3.org/TR/html5/offline.html#offline',
+										'wp': 	'/apis/appcache/ApplicationCache',
+										'mdn':	'/HTML/Using_the_application_cache'
+									}
 					}, {
 						id:			'registerProtocolHandler',
 						name: 		'Custom scheme handlers', 
-						url:		'http://www.w3.org/TR/html5/timers.html#custom-handlers'
+						urls:		{
+										'w3c':	'http://www.w3.org/TR/html5/timers.html#custom-handlers',
+										'mdn':	'/docs/Web-based_protocol_handlers'
+									}
 					}, {
 						id:			'registerContentHandler',
 						name: 		'Custom content handlers', 
-						url:		'http://www.w3.org/TR/html5/timers.html#custom-handlers'
+						urls:		{
+										'w3c':	'http://www.w3.org/TR/html5/timers.html#custom-handlers',
+										'mdn':	'/DOM/window.navigator.registerContentHandler'
+									}
 					}, {
 						id:			'addSearchProvider',
 						name: 		'Custom search providers', 
@@ -1184,15 +1251,24 @@ var tests = [
 					{
 						id:			'sandbox',
 						name: 		'Sandboxed <code>iframe</code>', 
-						url:		'http://www.w3.org/TR/html5/the-iframe-element.html#attr-iframe-sandbox'
+						urls:		{
+										'w3c':	'http://www.w3.org/TR/html5/the-iframe-element.html#attr-iframe-sandbox',
+										'mdn':	'/HTML/Element/iframe'
+									}
 					}, {
 						id:			'seamless',
 						name: 		'Seamless <code>iframe</code>', 
-						url:		'http://www.w3.org/TR/html5/the-iframe-element.html#attr-iframe-seamless'
+						urls:		{
+										'w3c':	'http://www.w3.org/TR/html5/the-iframe-element.html#attr-iframe-seamless',
+										'mdn':	'/HTML/Element/iframe'
+									}
 					}, {
 						id:			'srcdoc',
 						name: 		'<code>iframe</code> with inline contents', 
-						url:		'http://www.w3.org/TR/html5/the-iframe-element.html#attr-iframe-srcdoc'
+						urls:		{
+										'w3c':	'http://www.w3.org/TR/html5/the-iframe-element.html#attr-iframe-srcdoc',
+										'mdn':	'/HTML/Element/iframe'
+									}
 					}
 				]
 	}, {
@@ -1206,15 +1282,24 @@ var tests = [
 					}, {
 						id:			'async',
 						name: 		'Asyncronous script execution', 
-						url:		'http://www.w3.org/TR/html5/scripting-1.html#attr-script-async'
+						urls:		{
+										'w3c':	'http://www.w3.org/TR/html5/scripting-1.html#attr-script-async',
+										'mdn':	'/HTML/Element/script'
+									}
 					}, {
 						id:			'onerror',
 						name: 		'Runtime script error reporting', 
-						url:		'http://www.w3.org/TR/html5/webappapis.html#report-the-error'
+						urls:		{
+										'w3c':	'http://www.w3.org/TR/html5/webappapis.html#report-the-error',
+										'mdn':	'/DOM/window.onerror'
+									}
 					}, {
 						id:			'base64',
 						name: 		'Base64 encoding and decoding', 
-						url:		'http://www.w3.org/TR/html5/webappapis.html#atob'
+						url:		{
+										'w3c':	'http://www.w3.org/TR/html5/webappapis.html#atob',
+										'mdn':	'/DOM/window.atob'
+									}
 					}
 				]
 	},
@@ -1228,11 +1313,18 @@ var tests = [
 					{
 						id:			'geolocation',
 						name: 		'Geolocation', 
-						url:    	'http://www.w3.org/TR/geolocation-API/'
+						urls:		{
+										'w3c':	'http://www.w3.org/TR/geolocation-API/',
+										'wp': 	'/apis/geolocation',
+										'mdn':	'/Using_geolocation'
+									}
 					}, {
 						id:			'orientation',
 						name: 		'Device Orientation', 
-						url:    	'http://dev.w3.org/geo/api/spec-source-orientation.html'
+						urls:		{
+										'w3c':	'http://dev.w3.org/geo/api/spec-source-orientation.html',
+										'mdn':	'/Mozilla_event_reference/devicemotion'
+									}
 					}
 				]
 	}, {
@@ -1242,7 +1334,12 @@ var tests = [
 					{
 						id:			'context',
 						name: 		'3D context', 
-						url:    	'http://www.khronos.org/registry/webgl/specs/latest/'
+						urls:		{
+										'khronos':	'http://www.khronos.org/registry/webgl/specs/latest/',
+										'wp': 		'/webgl',
+										'mdn':		'/docs/WebGL'
+									}
+
 					}, {
 						id:			'datatypes',
 						name:		'Native binary data',
@@ -1298,14 +1395,25 @@ var tests = [
 					{
 						id:			'postMessage',
 						name: 		'Cross-document messaging', 
-						url:    	'http://dev.w3.org/html5/postmsg/'
+						urls:    	{
+										'w3c':	'http://dev.w3.org/html5/postmsg/',
+										'wp':	'/apis/web-messaging',
+										'mdn':	'/DOM/window.postMessage'
+									}
 					}, {
 						id:			'eventSource',
 						name: 		'Server-Sent Events', 
-						url:		'http://www.w3.org/TR/eventsource/'
+						urls:		{
+										'w3c':	'http://www.w3.org/TR/eventsource/',
+										'mdn':	'/Server-sent_events/Using_server-sent_events'
+									}
+
 					}, {
 						id:			'xmlhttprequest2',
 						name:		'XMLHttpRequest Level 2',
+						urls:		{
+										'mdn':	'/DOM/XMLHttpRequest'
+									},
 						items:		[
 										{
 											id:			'upload',
@@ -1332,7 +1440,10 @@ var tests = [
 					}, {
 						id:			'webSocket',
 						name: 		'WebSocket', 
-						url:		'http://www.w3.org/TR/websockets/'
+						urls:		{
+										'w3c':	'http://www.w3.org/TR/websockets/',
+										'mdn':	'/docs/WebSockets'
+									}
 					}
 				]
 	}, {
@@ -1342,7 +1453,11 @@ var tests = [
 					{
 						id:			'fileReader',
 						name: 		'File API', 
-						url:    	'http://dev.w3.org/2006/webapi/FileAPI/#filereader-interface'
+						urls:		{
+										'w3c':	'http://dev.w3.org/2006/webapi/FileAPI/#filereader-interface',
+										'wp': 	'/apis/file',
+										'mdn':	'/Using_files_from_web_applications'
+									}
 					}, 
 					
 					'<em>The Directories and System API proposal has failed to gain traction among browser vendors and is only supported in some Webkit based browsers. No additional points are awarded for supporting this API.</em>',
@@ -1360,15 +1475,27 @@ var tests = [
 					{
 						id:			'sessionStorage',
 						name: 		'Session Storage', 
-						url:    	'http://www.w3.org/TR/webstorage/#the-sessionstorage-attribute'
+						urls:		{
+										'w3c':	'http://www.w3.org/TR/webstorage/#the-sessionstorage-attribute',
+										'wp': 	'/apis/web-storage',
+										'mdn':	'/DOM/Storage'
+									}
 					}, {
 						id:			'localStorage',
 						name: 		'Local Storage', 
-						url:    	'http://www.w3.org/TR/webstorage/#the-localstorage-attribute'
+						urls:		{
+										'w3c':	'http://www.w3.org/TR/webstorage/#the-localstorage-attribute',
+										'wp': 	'/apis/web-storage',
+										'mdn':	'/DOM/Storage'
+									}
 					}, {
 						id:			'indexedDB',
 						name: 		'IndexedDB', 
-						url:		'http://www.w3.org/TR/IndexedDB/'
+						urls:		{
+										'w3c':	'http://www.w3.org/TR/IndexedDB/',
+										'wp': 	'/apis/indexedDB',
+										'mdn':	'/IndexedDB'
+									}
 					},
 					
 					'<em>The Web SQL Database specification is no longer being updated and has been replaced by IndexedDB. Because at least 3 vendors have shipped implementations of this specification we still include it in this test.</em>',
@@ -1386,11 +1513,17 @@ var tests = [
 					{
 						id:			'worker',
 						name: 		'Web Workers', 
-						url:    	'http://www.w3.org/TR/workers/#dedicated-workers-and-the-worker-interface'
+						urls:		{
+										'w3c':	'http://www.w3.org/TR/workers/#dedicated-workers-and-the-worker-interface',
+										'mdn':	'/DOM/Using_web_workers'
+									}
 					}, {
 						id:			'sharedWorker',
 						name: 		'Shared Workers', 
-						url:    	'http://www.w3.org/TR/workers/#shared-workers-and-the-sharedworker-interface'
+						urls:    	{
+										'w3c':	'http://www.w3.org/TR/workers/#shared-workers-and-the-sharedworker-interface',
+										'mdn':	'/DOM/Using_web_workers'
+									}
 					}
 				]
 	}, {
@@ -1398,9 +1531,12 @@ var tests = [
 		name:	'Local multimedia',
 		items:	[
 					{
-						id:		'getUserMedia',
-						name: 	'Access the webcam', 
-						url:	'http://dev.w3.org/2011/webrtc/editor/getusermedia.html'
+						id:			'getUserMedia',
+						name: 		'Access the webcam', 
+						urls:		{
+										'w3c':	'http://dev.w3.org/2011/webrtc/editor/getusermedia.html',
+										'mdn':	'/WebRTC'
+									}
 					}
 				]
 	}, {
@@ -1420,7 +1556,10 @@ var tests = [
 					{
 						id:			'pagevisiblity',
 						name: 		'Page Visibility', 
-						url:		'http://www.w3.org/TR/page-visibility/'
+						urls:		{
+										'w3c':	'http://www.w3.org/TR/page-visibility/',
+										'mdn':	'/DOM/Using_the_Page_Visibility_API'
+									}
 					}, {
 						id:			'getSelection',
 						name: 		'Text selection', 
@@ -1430,7 +1569,11 @@ var tests = [
 						name: 		'Scroll into view'
 					}, {
 						id: 		'mutationObserver',
-						name:   	'Mutation Observer'
+						name:   	'Mutation Observer',
+						urls:		{
+										'w3c':	'http://www.w3.org/TR/dom/#mutation-observers',
+										'mdn':	'/DOM/MutationObserver'
+									}
 					}
 				]
 	},
@@ -1454,15 +1597,27 @@ var tests = [
 					{
 						id:			'requestFullScreen',
 						name: 		'Full screen support', 
-						url:		'http://dvcs.w3.org/hg/fullscreen/raw-file/tip/Overview.html#api'
+						urls:		{
+										'w3c':	'http://dvcs.w3.org/hg/fullscreen/raw-file/tip/Overview.html#api',
+										'wp':	'/dom/methods/requestFullscreen',
+										'mdn':	'/DOM/Using_fullscreen_mode'
+									}
 					}, {
 						id:			'pointerLock',
 						name: 		'Pointer Lock support', 
-						url:		'http://dvcs.w3.org/hg/pointerlock/raw-file/default/index.html'
+						urls:		{
+										'w3c':	'http://dvcs.w3.org/hg/pointerlock/raw-file/default/index.html',
+										'wp':	'/dom/methods/requestPointerLock',
+										'mdn':	'/API/Pointer_Lock_API'
+									}
 					}, {
 						id:			'requestAnimationFrame',
 						name: 		'<code>window.requestAnimationFrame</code>', 
-						url:		'http://www.w3.org/TR/animation-timing/#requestAnimationFrame'
+						urls:		{
+										'w3c':	'http://www.w3.org/TR/animation-timing/#requestAnimationFrame',
+										'wp': 	'/apis/timing/methods/requestAnimationFrame',
+										'mdn':	'/DOM/window.requestAnimationFrame'
+									}
 					}
 				]
 	}
diff --git a/scripts/reporting.js b/scripts/reporting.js
index aedaf1dc..aed1af0b 100644
--- a/scripts/reporting.js
+++ b/scripts/reporting.js
@@ -51,6 +51,36 @@
 				onChange:		options.onChange || false
 			}
 
+			this.panel = null;
+
+			if (this.options.links) {
+				var that = this;
+				
+				function close(e) {
+					if (that.panel) {
+						var cell = that.panel.parentNode;
+						var node = e.target;
+
+						while (node.parentNode) {
+							if (node == that.panel) return;
+							node = node.parentNode;
+						}
+					
+						that.panel.parentNode.removeChild(that.panel);
+						that.panel = null;
+
+						var node = e.target;
+						while (node.parentNode) {
+							if (node == cell) return e.stopPropagation();
+							node = node.parentNode;
+						}
+					}	
+				}
+
+				document.addEventListener('click', close, true)
+				document.addEventListener('touchstart', close, true)
+			}
+
 			this.data = [];
 			for (var i = 0; i < this.options.columns; i++) {
 				this.data[i] = null;
@@ -183,8 +213,10 @@
 						var row = document.getElementById('head-' + tests[i].id);
 						var cell = row.childNodes[column + 1];
 						
+						var content = "<div class='grade'>";
+						
 						if (this.options.bonus && bonus > 0) {
-							cell.innerHTML += "<span class='bonus'>+" + bonus + "<span> " + t('bonus points') + "</span></span>";
+							content += "<span class='bonus'>+" + bonus + "<span> " + t('bonus points') + "</span></span>";
 						}
 												
 						if (this.options.grading) {
@@ -199,13 +231,16 @@
 							}
 						
 							if (points == maximum)
-								cell.innerHTML += "<span class='" + grade + "'>" + points + "</span>";
+								content += "<span class='" + grade + "'>" + points + "</span>";
 							else
-								cell.innerHTML += "<span class='" + grade + "'>" + points + "/" + maximum + "</span>";
+								content += "<span class='" + grade + "'>" + points + "/" + maximum + "</span>";
 						} else {
-							cell.innerHTML += points;
+							content += "<span>" + points + "</span>";
 						}
 
+						content += "</div>"
+						
+						cell.innerHTML = content;
 						this.updateItems(column, data, 0, this.tests[i].id, this.tests[i].items);
 					}
 				}
@@ -405,7 +440,7 @@
 			}
 		},
 		
-		createItems: function(parent, level, id, tests) {
+		createItems: function(parent, level, id, tests, parentUrls) {
 			var ids = [];
 			
 			for (var i = 0; i < tests.length; i++) {
@@ -423,13 +458,9 @@
 					}
 				} else {
 					var th = document.createElement('th');
-					if (this.options.links && typeof tests[i].url != 'undefined') 
-						th.innerHTML = "<a href='" + tests[i].url + "'>" + t(tests[i].name) + "</a>";
-					else
-						th.innerHTML = "<span>" + t(tests[i].name) + "</span>";
-					
+					th.innerHTML = "<span>" + t(tests[i].name) + "</span>";
 					tr.appendChild(th);
-					
+
 					for (var c = 0; c < this.options.columns; c++) {
 						var td = document.createElement('td');
 						tr.appendChild(td);
@@ -442,8 +473,19 @@
 					}
 					
 					if (typeof tests[i].items != 'undefined') {
+						var urls = null;
+
+						if (this.options.links) {
+							if (typeof tests[i].urls != 'undefined') {
+								urls = tests[i].urls;	
+							}						
+							else if (typeof tests[i].url != 'undefined') {
+								urls = { 'w3c': tests[i].url };
+							}
+						}
+
 						tr.className += 'hasChild';
-						var children = this.createItems(parent, level + 1, id + '-' + tests[i].id, tests[i].items);
+						var children = this.createItems(parent, level + 1, id + '-' + tests[i].id, tests[i].items, urls);
 						this.hideChildren(tr, children);
 						
 						(function(that, tr, th, children) {
@@ -455,6 +497,30 @@
 						if (this.options.features) {
 							th.innerHTML = "<a href='/compare/feature/" + id + '-' + tests[i].id + ".html'>" + t(tests[i].name) + " <span>»</span></a>";
 						}
+
+						if (this.options.links) {
+							var urls;
+							var showLinks = false;
+		
+							if (typeof tests[i].urls != 'undefined') {
+								urls = tests[i].urls;	
+								showLinks = true;
+							}						
+							else if (typeof tests[i].url != 'undefined') {
+								urls = { 'w3c': tests[i].url };
+								showLinks = true;
+							}
+							
+							if (showLinks) {
+								th.className = 'hasLink';
+								
+								(function(that, th, id, name, parentUrls, urls) {
+									th.onclick = function() {
+										that.showLinks(th, id, name, parentUrls, urls);
+									};		
+								})(this, th, id + '-' + tests[i].id, tests[i].name, parentUrls, urls);
+							}
+						}
 					}
 					
 					ids.push(tr.id);
@@ -464,6 +530,27 @@
 			return ids;
 		},
 	
+		showLinks: function(parent, id, name, parentUrls, urls) {
+			if (this.panel) {
+				this.panel.parentNode.removeChild(this.panel);
+				this.panel = null;
+			}
+			
+			var result = {};
+			if (parentUrls) for (key in parentUrls) result[key] = parentUrls[key];
+			if (urls) for (key in urls) result[key] = urls[key];
+			
+			var content = "<a href='/compare/feature/" + id +".html' class='compare'>" + t('Compare browsers') + "</a>";
+			if (typeof result.w3c != 'undefined') content += "<a href='" + result.w3c +"' class='w3c'>" + t('Go to the specification at W3C.org') + "</a>";
+			if (typeof result.khronos != 'undefined') content += "<a href='" + result.khronos +"' class='khronos'>" + t('Go to the specification at Khronos.org') + "</a>";
+			if (typeof result.wp != 'undefined') content += "<a href='http://docs.webplatform.org/wiki" + result.wp +"' class='wp'>" + t('Documentation at WebPlatform.org') + "</a>";
+			if (typeof result.mdn != 'undefined') content += "<a href='https://developer.mozilla.org/en-US/docs" + result.mdn +"' class='mdn'>" + t('Documentation at Mozilla Developer Network') + "</a>";
+		
+			this.panel = document.createElement('div');
+			this.panel.className = 'linksPanel';
+			this.panel.innerHTML = content;
+			parent.appendChild(this.panel);
+		},
 	
 		toggleChildren: function(element, ids) {
 			if (element.className.indexOf(' hidden') == -1) {

From 61aa3ad484e1e61f6e95b77bf3e60a44510455cc Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Mon, 15 Oct 2012 19:01:18 +0200
Subject: [PATCH 070/174] Many changes to useragent detection

---
 scripts/useragents.js | 5153 ++++++++++++++++++-----------------------
 1 file changed, 2258 insertions(+), 2895 deletions(-)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 671b7060..90c6e6b7 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -1,10 +1,11 @@
 var UserAgents = (function(){
-		
+	
 	var STRINGS_ZTE = 'ZTE',
 		STRINGS_TOSHIBA = 'Toshiba',
 		STRINGS_TI = 'Texas Instruments',
 		STRINGS_SAMSUNG = 'Samsung',
 		STRINGS_SHARP = 'Sharp',
+		STRINGS_SONY = 'Sony',
 		STRINGS_SONY_ERICSSON = 'Sony Ericsson',
 		STRINGS_QUALCOMM = 'Qualcomm',
 		STRINGS_PANTECH = 'Pantech',
@@ -19,2551 +20,2083 @@ var UserAgents = (function(){
 		STRINGS_ARCHOS = 'Archos',
 		STRINGS_ALCATEL = 'Alcatel',
 		STRINGS_ACER = 'Acer',
-		
 		STRINGS_GALAXY = 'Galaxy',
 		STRINGS_XPERIA = 'Xperia';
-		STRINGS_BASED = ' based device';
-	
-	var TOUCHWIZ_MODELS = {
-		'SAMSUNG': {
-			'GT-S3370C':							[ STRINGS_SAMSUNG, 'Corby 3G' ],
-			'GT-S3650':								[ STRINGS_SAMSUNG, 'Corby' ],
-			'GT-S3653':								[ STRINGS_SAMSUNG, 'Corby' ],
-			'GT-S3850':								[ STRINGS_SAMSUNG, 'Corby II' ],
-			'GT-S5230':								[ STRINGS_SAMSUNG, 'Star' ],
-			'GT-S5230W':							[ STRINGS_SAMSUNG, 'Star' ],
-			'GT-S5233':								[ STRINGS_SAMSUNG, 'Star' ],
-			'GT-S5260':								[ STRINGS_SAMSUNG, 'Star II' ],
-			'GT-S5560':								[ STRINGS_SAMSUNG, 'Marvel' ],
-			'GT-S5620':								[ STRINGS_SAMSUNG, 'Monte' ],
-			'GT-S7550':								[ STRINGS_SAMSUNG, 'Blue Earth' ],
-			'GT-S8000':								[ STRINGS_SAMSUNG, 'Jet' ],
-			'GT-S8003':								[ STRINGS_SAMSUNG, 'Jet' ],
-			'SGH-F480':								[ STRINGS_SAMSUNG, 'Tocco' ],
-			'SGH-T528g':							[ STRINGS_SAMSUNG, 'Straight Talk' ],
-			'GT-B3410':								[ STRINGS_SAMSUNG, 'Star Qwerty' ],
-			'GT-B5310':								[ STRINGS_SAMSUNG, 'Corby Pro' ],
-			'GT-B7722':								[ STRINGS_SAMSUNG, 'Star Duos' ],
-			'GT-C6712':								[ STRINGS_SAMSUNG, 'Star II Duos' ]
-		}
-	}
+
+	var STRINGS_BASED = ' based device';
 	
-	var BADA_MODELS = {
-		'SAMSUNG': {
-			'GT- S5250':							[ STRINGS_SAMSUNG, 'Wave 525' ],
-			'GT-S5250':								[ STRINGS_SAMSUNG, 'Wave 525' ],
-			'GT-S5253':								[ STRINGS_SAMSUNG, 'Wave 525' ],
-			'GT-S5330':								[ STRINGS_SAMSUNG, 'Wave 533' ],
-			'GT-S5380':								[ STRINGS_SAMSUNG, 'Wave Y' ],
-			'GT-S5380D':							[ STRINGS_SAMSUNG, 'Wave Y' ],
-			'GT-S5380K':							[ STRINGS_SAMSUNG, 'Wave Y' ],
-			'GT-S5750E':							[ STRINGS_SAMSUNG, 'Wave 575' ],
-			'GT-S5753E':							[ STRINGS_SAMSUNG, 'Wave 575' ],
-			'GT-S7230B':							[ STRINGS_SAMSUNG, 'Wave 723' ],
-			'GT-S7230E':							[ STRINGS_SAMSUNG, 'Wave 723' ],
-			'GT-S7233E':							[ STRINGS_SAMSUNG, 'Wave 723' ],
-			'GT-S7250':								[ STRINGS_SAMSUNG, 'Wave M' ],
-			'GT-S7250D':							[ STRINGS_SAMSUNG, 'Wave M' ],
-			'GT-S8500':								[ STRINGS_SAMSUNG, 'Wave' ],
-			'GT-S8500C':							[ STRINGS_SAMSUNG, 'Wave' ],
-			'GT-S8500R':							[ STRINGS_SAMSUNG, 'Wave' ],
-			'GT-S8500T':							[ STRINGS_SAMSUNG, 'Wave' ],
-			'GT-S8530':								[ STRINGS_SAMSUNG, 'Wave II' ],
-			'GT-S8600':								[ STRINGS_SAMSUNG, 'Wave 3' ],
-			'SHW-M410':								[ STRINGS_SAMSUNG, 'Wave 3' ]
-		}
-	}
+	var TYPE_EREADER = 'ereader',
+		TYPE_MOBILE = 'mobile',
+		TYPE_TABLET = 'tablet',
+		TYPE_TELEVISION = 'television';
+
+	var DeviceModels = (function(){
+		DeviceModels = {
+			identify: function() {
+				var type = Array.prototype.shift.call(arguments);
+				
+				switch(type) {
+					case 'android':		return DeviceModels.identifyAndroid.apply(this, arguments);
+					case 'blackberry':	return DeviceModels.identifyBlackBerry.apply(this, arguments);
+					case 'bada': 		return DeviceModels.identifyList.apply(this, [ BADA_MODELS ].concat(Array.prototype.slice.call(arguments)));
+					case 'brew': 		return DeviceModels.identifyList.apply(this, [ BREW_MODELS ].concat(Array.prototype.slice.call(arguments)));
+					case 'tizen': 		return DeviceModels.identifyList.apply(this, [ TIZEN_MODELS ].concat(Array.prototype.slice.call(arguments)));
+					case 'touchwiz': 	return DeviceModels.identifyList.apply(this, [ TOUCHWIZ_MODELS ].concat(Array.prototype.slice.call(arguments)));
+					case 'wm': 			return DeviceModels.identifyList.apply(this, [ WINDOWS_MOBILE_MODELS ].concat(Array.prototype.slice.call(arguments)));
+					case 'wp': 			return DeviceModels.identifyList.apply(this, [ WINDOWS_PHONE_MODELS ].concat(Array.prototype.slice.call(arguments)));
+				}
+			},
+			
+			identifyList: function(list, model) {
+				model = DeviceModels.cleanup(model);
+			
+				var device = {
+					type:			TYPE_MOBILE,
+					identified:		false,
+					manufacturer:	null,
+					model:			model
+				};
+
+				for (var m in list) {
+					var match = false;
+					if (m.substring(m.length - 1) == "!")
+						match = model.match(new RegExp('^' + m.substring(0,m.length - 1), 'i'));
+					else
+						match = m.toLowerCase() == model.toLowerCase();
+					
+					if (match) {
+	 					device.manufacturer = list[m][0];
+						device.model = list[m][1];
+						if (typeof list[m][2] != 'undefined') device.type = list[m][2];
+						device.identified = true;
+						
+						return device;
+					}
+				}
+				
+				return device;
+			},
+			
+			identifyAndroid: function(model) {
+				var result = DeviceModels.identifyList(ANDROID_MODELS, model);
+
+				if (!result.identified) {
+					model = DeviceModels.cleanup(model);
+					if (model.match(/AndroVM/) || model == 'Emulator' || model == 'x86 Emulator' || model == 'x86 VirtualBox' || model == 'vm') {
+						return {
+							type:			'emulator',
+							identified:		true,
+							manufacturer:	null,
+							model:			null
+						};
+					}
+				}
+				
+				return result;
+			},
+			
+			identifyBlackBerry: function(model) {
+				if (typeof BLACKBERRY_MODELS[model] != 'undefined') return 'BlackBerry ' + BLACKBERRY_MODELS[model] + ' ' + model;
+				return 'BlackBerry ' + model;
+			},
+
+			cleanup: function(s) {
+				s = typeof s == 'undefined' ? '' : s;
+			
+				s = s.replace(/_TD$/, '');
+				s = s.replace(/_CMCC$/, '');
+		
+				s = s.replace(/_/g, " ");
+				s = s.replace(/^\s+|\s+$/g, "");
+				s = s.replace(/\/[^/]+$/, "");
+				s = s.replace(/\/[^/]+ Android\/.*/, "");
+		
+				s = s.replace(/^tita on /, '');
+				s = s.replace(/^ICS AOSP on /, '');
+				s = s.replace(/^Android (on |for )/, '');
+				s = s.replace(/^Full (AOSP on |Android on |Cappuccino on |MIPS Android on |Android)/, '');
+		
+				s = s.replace(/^Acer ?/i, '');
+				s = s.replace(/^Iconia( Tab)? /, '');
+				s = s.replace(/^ASUS ?/, '');
+				s = s.replace(/^Ainol /, '');
+				s = s.replace(/^Coolpad ?/i, 'Coolpad ');
+				s = s.replace(/^ALCATEL /, '');
+				s = s.replace(/^Alcatel OT-(.*)/, 'one touch $1');
+				s = s.replace(/^YL-/, '');
+				s = s.replace(/^Novo7 ?/i, 'Novo7 ');
+				s = s.replace(/^GIONEE /, '');
+				s = s.replace(/^HW-/, '');
+				s = s.replace(/^Huawei[ -]/i, 'Huawei ');
+				s = s.replace(/^SAMSUNG[ -]/i, '');
+				s = s.replace(/^(Sony ?Ericsson|Sony)/, '');
+				s = s.replace(/^(Lenovo Lenovo|LNV-Lenovo)/, 'Lenovo');
+				s = s.replace(/^Lenovo-/, 'Lenovo ');
+				s = s.replace(/^ZTE-/, 'ZTE ');
+				s = s.replace(/^(LG)[ _\/]/, '$1-');
+				s = s.replace(/^(HTC.*)\s(?:v|V)?[0-9.]+$/, '$1');
+				s = s.replace(/^(HTC)[-\/]/, '$1 ');
+				s = s.replace(/^(HTC)([A-Z][0-9][0-9][0-9])/, '$1 $2');
+				s = s.replace(/^(Motorola[\s|-])/, '')
+				s = s.replace(/^(Moto|MOT-)/, '')
+
+				s = s.replace(/-?(orange(-ls)?|vodafone|bouygues|parrot|Kust)$/i, '');
+				s = s.replace(/http:\/\/.+$/i, '');
+				s = s.replace(/^\s+|\s+$/g, "");
+		
+				return s;
+			}			
+		};
+
 	
-	var TIZEN_MODELS = {
-		'SAMSUNG': {
-			'GT-I9500':								[ STRINGS_SAMSUNG, 'GT-I9500' ]
-		}
-	}
+		var ANDROID_MODELS = {
+			/* Generic identifiers */
+			'Android':									[ null, null ],		
+			'google sdk':								[ null, null ],		
+			'sdk':										[ null, null ],
+			'generic':									[ null, null ],
+			'generic x86':								[ null, null ],
+			
+			/* Development boards and kits */
+			'amd brazos':								[ 'AMD', 'Fusion' + STRINGS_BASED ],
+			'Amlogic M1 reference board':				[ 'Amlogic', 'M1 reference board' ],
+			'AML8726M':									[ 'Amlogic', 'AML8726-M' + STRINGS_BASED ],
+			'vexpress a9':								[ 'ARM', 'Versatile Express development platform' ],
+			'bcm7231':									[ 'Broadcom', 'BCM7231' + STRINGS_BASED, TYPE_TELEVISION ],
+			'bcm7425':									[ 'Broadcom', 'BCM7425' + STRINGS_BASED, TYPE_TELEVISION ],
+			'bcm7429':									[ 'Broadcom', 'BCM7429' + STRINGS_BASED, TYPE_TELEVISION ],
+			'imx50!':									[ 'Freescale', 'i.MX50' + STRINGS_BASED ],
+			'imx51!':									[ 'Freescale', 'i.MX51' + STRINGS_BASED ],
+			'imx53!':									[ 'Freescale', 'i.MX53' + STRINGS_BASED ],
+			'imx6q!':									[ 'Freescale', 'i.MX6Q' + STRINGS_BASED ],
+			'ODROID-A':									[ 'Hardkernel', 'ODROID-A developer tablet', TYPE_TABLET ],
+			'mfld (dv10|dv20|lw00|pr2|pr3)!':			[ 'Intel', 'Medfield' + STRINGS_BASED ],
+			'berlin bg2':								[ 'Marvell', 'Armada 1000' + STRINGS_BASED, TYPE_TELEVISION ],
+			'MStar Amber3':								[ 'MStar', 'Amber3' + STRINGS_BASED ],
+			'Konka Amber3':								[ 'MStar', 'Amber3' + STRINGS_BASED ],
+			'mt5396':									[ 'Mediatek', 'MT5396' + STRINGS_BASED, TYPE_TELEVISION ],
+			'bird75v2':									[ 'Mediatek', 'MT6575' + STRINGS_BASED ],
+			'eagle75v1 2':								[ 'Mediatek', 'MT6575' + STRINGS_BASED ],
+			'mt6575!':									[ 'Mediatek', 'MT6575' + STRINGS_BASED ],		
+			'mt8658':									[ 'Mediatek', 'MT8658' + STRINGS_BASED ],
+			'MBX DVBT reference board (c03ref)':		[ 'MXB', 'DVBT reference board', TYPE_TELEVISION ],
+			'NS2816':									[ 'Nufront', 'NuSmart 2816' + STRINGS_BASED ],
+			'Ventana':									[ 'nVidia', 'Tegra Ventana development kit' ],
+			'Cardhu':									[ 'nVidia', 'Tegra 3' + STRINGS_BASED ],
+			'Panda(Board)?!':							[ 'Pandaboard', 'Development Kit' ],
+			'MSM':										[ STRINGS_QUALCOMM, 'Snapdragon' + STRINGS_BASED ],
+			'msm(7227|7627)!':							[ STRINGS_QUALCOMM, 'Snapdragon S1' + STRINGS_BASED ],
+			'msm7630!':									[ STRINGS_QUALCOMM, 'Snapdragon S2' + STRINGS_BASED ],
+			'msm8660!':									[ STRINGS_QUALCOMM, 'Snapdragon S3' + STRINGS_BASED ],
+			'msm(8625|8960)!':							[ STRINGS_QUALCOMM, 'Snapdragon S4' + STRINGS_BASED ],
+			'msm8974!':									[ STRINGS_QUALCOMM, 'Snapdragon' + STRINGS_BASED ],
+			'rk2808(sdk)?!':							[ 'Rockchip', 'RK2808' + STRINGS_BASED ],
+			'rk2818(sdk)?!':							[ 'Rockchip', 'RK2818' + STRINGS_BASED ],
+			'Android-for-Rockchip-2818':				[ 'Rockchip', 'RK2818' + STRINGS_BASED ],
+			'rk29sdk':									[ 'Rockchip', 'RK29' + STRINGS_BASED ],
+			'rk30sdk':									[ 'Rockchip', 'RK30' + STRINGS_BASED ],
+			's3c6410':									[ STRINGS_SAMSUNG, 'S3C6410' + STRINGS_BASED ],
+			'smdk6410':									[ STRINGS_SAMSUNG, 'S3C6410' + STRINGS_BASED ],
+			'SMDKC110':									[ STRINGS_SAMSUNG, 'Exynos 3110' + STRINGS_BASED ],
+			'SMDKV210':									[ STRINGS_SAMSUNG, 'Exynos 4210' + STRINGS_BASED ],
+			'S5PV210':									[ STRINGS_SAMSUNG, 'Exynos 4210' + STRINGS_BASED ],
+			'sec smdkc210':								[ STRINGS_SAMSUNG, 'Exynos 4210' + STRINGS_BASED ],
+			'SMDK4x12':									[ STRINGS_SAMSUNG, 'Exynos 4212 or 4412' + STRINGS_BASED ],
+			'SMDK5250':									[ STRINGS_SAMSUNG, 'Exynos 5250' + STRINGS_BASED ],									
+			'smp86xx':									[ 'Sigma', 'SMP86xx' + STRINGS_BASED, TYPE_TELEVISION ],
+			'sv8860':									[ 'Skyviia', 'SV8860' + STRINGS_BASED, TYPE_TELEVISION ],
+			'ste u8500':								[ 'ST Ericsson', 'Novathor U8500' + STRINGS_BASED ],
+			'Telechips M801 Evaluation Board':			[ 'Telechips', 'M801' + STRINGS_BASED, TYPE_TELEVISION ],
+			'Telechips TCC8900 Evaluation Board':		[ 'Telechips', 'TCC8900' + STRINGS_BASED, TYPE_TELEVISION ],
+			'TCC8920 STB EV':							[ 'Telechips', 'TCC8920' + STRINGS_BASED, TYPE_TELEVISION ],
+			'OMAP':										[ STRINGS_TI, 'OMAP' + STRINGS_BASED ],
+			'OMAP SS':									[ STRINGS_TI, 'OMAP' + STRINGS_BASED ],
+			'LogicPD Zoom2':							[ STRINGS_TI, 'OMAP' + STRINGS_BASED ],
+			'omap3evm':									[ STRINGS_TI, 'OMAP3' + STRINGS_BASED ],
+			'Omap5sevm':								[ STRINGS_TI, 'OMAP5' + STRINGS_BASED ],
+			'pnx8473 kiryung':							[ 'Trident', 'PNX8473' + STRINGS_BASED, TYPE_TELEVISION ],
+			
+			/* Official Google development devices */
+			'Crespo!':									[ 'Google', 'Nexus S' ],
+			'Passion':									[ 'Google', 'Nexus One' ],
+			'Bravo':									[ STRINGS_HTC, 'Desire' ],
+			'Dream':									[ STRINGS_HTC, 'Dream' ],
+			'Vogue':									[ STRINGS_HTC, 'Touch' ],
+			'Vendor Optimus':							[ STRINGS_LG, 'Optimus' ],
+			'Stingray':									[ STRINGS_MOTOROLA, 'XOOM', TYPE_TABLET ],
+			'Wingray':									[ STRINGS_MOTOROLA, 'XOOM', TYPE_TABLET ],
+			'Maguro':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
+			'Toro-VZW':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
+			'Blaze':									[ STRINGS_TI, 'Blaze Tablet', TYPE_TABLET ],
+			'Blaze Tablet':								[ STRINGS_TI, 'Blaze Tablet', TYPE_TABLET ],
+			
+			/* Middleware and emulators */
+			'BlueStacks':								[ 'BlueStacks', 'App Player', 'desktop' ],
+			'youwave custom':							[ 'Youwave', 'Android on PC', 'desktop' ],
+			'BlackBerry Runtime for Android Apps':		[ 'RIM', 'BlackBerry (Android Runtime)', TYPE_MOBILE ],
+			
+			/* Regular devices */
+			'A100':										[ STRINGS_ACER, 'Iconia Tab A100', TYPE_TABLET ],
+			'A101':										[ STRINGS_ACER, 'Iconia Tab A101', TYPE_TABLET ],
+			'A110':										[ STRINGS_ACER, 'Iconia Tab A110', TYPE_TABLET ],
+			'A200':										[ STRINGS_ACER, 'Iconia Tab A200', TYPE_TABLET ],
+			'A211':										[ STRINGS_ACER, 'Iconia Tab A211', TYPE_TABLET ],
+			'A500':										[ STRINGS_ACER, 'Iconia Tab A500', TYPE_TABLET ],
+			'A501':										[ STRINGS_ACER, 'Iconia Tab A501', TYPE_TABLET ],
+			'A510':										[ STRINGS_ACER, 'Iconia Tab A510', TYPE_TABLET ],
+			'A511':										[ STRINGS_ACER, 'Iconia Tab A511', TYPE_TABLET ],
+			'A700':										[ STRINGS_ACER, 'Iconia Tab A700', TYPE_TABLET ],
+			'P2A700':									[ STRINGS_ACER, 'Iconia Tab A700', TYPE_TABLET ],
+			'A701':										[ STRINGS_ACER, 'Iconia Tab A701', TYPE_TABLET ],
+			'A800':										[ STRINGS_ACER, 'Iconia Tab A800', TYPE_TABLET ],
+			'E110':										[ STRINGS_ACER, 'beTouch E110' ],
+			'E120':										[ STRINGS_ACER, 'beTouch E120' ],
+			'E130':										[ STRINGS_ACER, 'beTouch E130' ],
+			'E140':										[ STRINGS_ACER, 'beTouch E140' ],
+			'E210':										[ STRINGS_ACER, 'beTouch E210' ],
+			'E310':										[ STRINGS_ACER, 'Liquid mini' ],
+			'E320':										[ STRINGS_ACER, 'Liquid Express' ],
+			'E330':										[ STRINGS_ACER, 'Liquid Glow' ],
+			'E350':										[ STRINGS_ACER, 'Liquid Gallant' ],
+			'E400':										[ STRINGS_ACER, 'beTouch E400' ],
+			'G100W':									[ STRINGS_ACER, 'G100W' ],
+			'S100':										[ STRINGS_ACER, 'Liquid' ],
+			'S110':										[ STRINGS_ACER, 'Stream' ],
+			'S120':										[ STRINGS_ACER, 'Liquid mt' ],
+			'S300':										[ STRINGS_ACER, 'Iconia Smart' ],
+			'S500':										[ STRINGS_ACER, 'CloudMobile' ],
+			'TD600':									[ STRINGS_ACER, 'beTouch TD600' ],
+			'Liquid':									[ STRINGS_ACER, 'Liquid' ],
+			'Liquid E':									[ STRINGS_ACER, 'Liquid E' ],
+			'Liquid MT':								[ STRINGS_ACER, 'Liquid mt' ],
+			'Liquid Metal':								[ STRINGS_ACER, 'Liquid mt' ],
+			'Stream':									[ STRINGS_ACER, 'Stream' ],
+			'N700':										[ 'aigo', 'N700', TYPE_TABLET ],
+			'M801':										[ 'aigo', 'M801', TYPE_TABLET ],
+			'Novo7':									[ 'Ainovo', 'Novo7', TYPE_TABLET ],
+			'Novo7 Aurora':								[ 'Ainovo', 'Novo7 Aurora', TYPE_TABLET ],
+			'Novo7 Advanced':							[ 'Ainovo', 'Novo7 Advanced', TYPE_TABLET ],
+			'Novo7 Advanced2':							[ 'Ainovo', 'Novo7 Advanced 2', TYPE_TABLET ],
+			'Novo7 Basic':								[ 'Ainovo', 'Novo7 Basic', TYPE_TABLET ],
+			'Novo7 ELF':								[ 'Ainovo', 'Novo7 Elf', TYPE_TABLET ],
+			'Novo7 Fire':								[ 'Ainovo', 'Novo7 Fire', TYPE_TABLET ],
+			'Novo7 Flame':								[ 'Ainovo', 'Novo7 Flame', TYPE_TABLET ],
+			'Novo7 PALADIN':							[ 'Ainovo', 'Novo7 Paladin', TYPE_TABLET ],
+			'Novo8 Advanced':							[ 'Ainovo', 'Novo8 Advanced', TYPE_TABLET ],
+			'one touch 890!':							[ STRINGS_ALCATEL, 'One Touch 890' ],
+			'one touch 891!':							[ STRINGS_ALCATEL, 'One Touch 891' ],
+			'one touch 903!':							[ STRINGS_ALCATEL, 'One Touch 903' ],
+			'one touch 906!':							[ STRINGS_ALCATEL, 'One Touch 906' ],
+			'one touch 908!':							[ STRINGS_ALCATEL, 'One Touch 908' ],
+			'one touch 910!':							[ STRINGS_ALCATEL, 'One Touch 910' ],
+			'one touch 918!':							[ STRINGS_ALCATEL, 'One Touch 918' ],
+			'one touch 980!':							[ STRINGS_ALCATEL, 'One Touch 980' ],
+			'one touch 981!':							[ STRINGS_ALCATEL, 'One Touch 981' ],
+			'one touch 986!':							[ STRINGS_ALCATEL, 'One Touch 986' ],
+			'one touch 990!':							[ STRINGS_ALCATEL, 'One Touch 990' ],
+			'one touch 991!':							[ STRINGS_ALCATEL, 'One Touch 991' ],
+			'one touch 993!':							[ STRINGS_ALCATEL, 'One Touch 993' ],
+			'one touch 995!':							[ STRINGS_ALCATEL, 'One Touch 995' ],
+			'one touch 997!':							[ STRINGS_ALCATEL, 'One Touch 997' ],
+			'Telenor OneTouch':							[ STRINGS_ALCATEL, 'One Touch 990' ],
+			'OT 918':									[ STRINGS_ALCATEL, 'One Touch 918' ],
+			'Venture':									[ STRINGS_ALCATEL, 'Venture' ],
+			'Allwinner A10':							[ 'AllWinner', 'A10', TYPE_TABLET ],
+			'97FC':										[ 'AllWinner', 'A10 97FC', TYPE_TABLET ],
+			'(Amazon )?Kindle Fire!':					[ 'Amazon', 'Kindle Fire', TYPE_TABLET ],
+			'KFOT':										[ 'Amazon', 'Kindle Fire', TYPE_TABLET ],	
+			'KFTT':										[ 'Amazon', 'Kindle Fire HD 7"', TYPE_TABLET ],
+			'WFJW[IA]!':								[ 'Amazon', 'Kindle Fire HD 8.9"', TYPE_TABLET ],
+			'AMD120':									[ 'AnyDATA', 'AnyTAB AMD120', TYPE_TABLET ],
+			'MW0811':									[ 'AOC', 'Breeze MW0811', TYPE_TABLET ],
+			'MW0821 V2.0':								[ 'AOC', 'Breeze MW0821', TYPE_TABLET ],
+			'MW0922':									[ 'AOC', 'Breeze MW0922', TYPE_TABLET ],
+			'Apanda.A60!':								[ 'Apanda', 'A60' ],
+			'apanda-A80S':								[ 'Apanda', 'A80' ],
+			'A80KSC':									[ STRINGS_ARCHOS, 'Arnova 8', TYPE_TABLET ],
+			'AN7CG2':									[ STRINGS_ARCHOS, 'Arnova 7', TYPE_TABLET ],
+			'A101B':									[ STRINGS_ARCHOS, 'Arnova 10', TYPE_TABLET ],
+			'AN10BG2DT':								[ STRINGS_ARCHOS, 'Arnova 10 B', TYPE_TABLET ],
+			'AN10G2':									[ STRINGS_ARCHOS, 'Arnova 10 G2', TYPE_TABLET ],
+			'A32':										[ STRINGS_ARCHOS, '32', 'media' ],
+			'A35DE':									[ STRINGS_ARCHOS, '35 Smart Home Phone' ],
+			'A43':										[ STRINGS_ARCHOS, '43', 'media' ],
+			'Archos5':									[ STRINGS_ARCHOS, '5', 'media' ],
+			'A70H':										[ STRINGS_ARCHOS, '7 Home Tablet', TYPE_TABLET ],					// G7
+			'A70HB':									[ STRINGS_ARCHOS, '7 Home Tablet', TYPE_TABLET ],
+			'A70BHT':									[ STRINGS_ARCHOS, '7 Home Tablet', TYPE_TABLET ],
+			'A70CHT':									[ STRINGS_ARCHOS, '7 Home Tablet', TYPE_TABLET ],
+			'A70S':										[ STRINGS_ARCHOS, '70 Internet Tablet', TYPE_TABLET ],				// G8
+			'A7EB':										[ STRINGS_ARCHOS, '70B Internet Tablet', TYPE_TABLET ],
+			'ARCHOS 70it2':								[ STRINGS_ARCHOS, '70B Internet Tablet', TYPE_TABLET ],		
+			'A101IT':									[ STRINGS_ARCHOS, '101 Internet Tablet', TYPE_TABLET ],		
+			'ARCHOS 80G9':								[ STRINGS_ARCHOS, '80 G9', TYPE_TABLET ],							// G9
+			'ARCHOS 101G9':								[ STRINGS_ARCHOS, '101 G9', TYPE_TABLET ],						
+			'ARCHOS 97XSLG10':							[ STRINGS_ARCHOS, '97 XS', TYPE_TABLET ],							// G10
+			'ARCHOS 101G10':							[ STRINGS_ARCHOS, '101 XS', TYPE_TABLET ],
+			'ARCHOS 97 CARBON':							[ STRINGS_ARCHOS, '97 Carbon', TYPE_TABLET ],						// Elements
+			'ASTRI':									[ 'ASTRI', 'e-reader', TYPE_EREADER ],
+			'eeepc':									[ STRINGS_ASUS, 'Eee Pc' ],
+			'asus laptop':								[ STRINGS_ASUS, 'Eee Pc' ],
+			'ME171':									[ STRINGS_ASUS, 'Eee Pad MeMO', TYPE_TABLET ],
+			'Slider SL101':								[ STRINGS_ASUS, 'Eee Pad Slider', TYPE_TABLET ],
+			'EPAD':										[ STRINGS_ASUS, 'Eee Pad Transformer', TYPE_TABLET ],
+			'TF101':									[ STRINGS_ASUS, 'Eee Pad Transformer', TYPE_TABLET ],
+			'Transformer TF101(G)?!':					[ STRINGS_ASUS, 'Eee Pad Transformer', TYPE_TABLET ],
+			'TF201':									[ STRINGS_ASUS, 'Eee Pad Transformer Prime', TYPE_TABLET ],
+			'Transformer Prime TF201':					[ STRINGS_ASUS, 'Eee Pad Transformer Prime', TYPE_TABLET ],
+			'Transformer Prime':						[ STRINGS_ASUS, 'Eee Pad Transformer Prime', TYPE_TABLET ],
+			'Transformer (Pad )?TF300(T|TG|TL)!':		[ STRINGS_ASUS, 'Transformer Pad 300', TYPE_TABLET ],
+			'Transformer (Pad )?TF700(T|K)!':			[ STRINGS_ASUS, 'Transformer Pad Infinity 700', TYPE_TABLET ],
+			'PadFone':									[ STRINGS_ASUS, 'Padfone', TYPE_TABLET ],
+			'OMS TTD':									[ STRINGS_ASUS, 'Eee Pc T10' ],
+			'ASUS T20':									[ STRINGS_ASUS, 'Eee Pc T20' ],
+			'ETBW11AA':									[ STRINGS_ASUS, 'Tough' ],
+			'AUX V900':									[ 'AUX', 'V900' ],
+			'PICOpad-QGN':								[ 'Axioo', 'Picopad QGN', TYPE_TABLET ],
+			'NOOK':										[ STRINGS_BN, 'NOOK', TYPE_EREADER ],
+			'Nook ?Color':								[ STRINGS_BN, 'NOOK Color', TYPE_EREADER ],
+			'(NOOK )?BNRV(200|300)!':					[ STRINGS_BN, 'NOOK Color', TYPE_EREADER ],
+			'Nook ?Tablet!':							[ STRINGS_BN, 'NOOK Tablet', TYPE_EREADER ],
+			'(NOOK )?BNTV250!':							[ STRINGS_BN, 'NOOK Tablet', TYPE_EREADER ],
+			'NOOK Slate':								[ STRINGS_BN, 'NOOK Tablet', TYPE_EREADER ],
+			'BenWee 5100':								[ 'BenWee', '5100' ],
+			'CA907AAC0G':								[ 'Besta', 'CA907AAC0G' ],
+			'BM999':									[ 'Bmorn', 'BM999', TYPE_TABLET ],
+			'V11':										[ 'Bmorn', 'V11', TYPE_TABLET ],
+			'V99':										[ 'Bmorn', 'V99', TYPE_TABLET ],
+			'bq DaVinci':								[ 'bq', 'DaVinci', TYPE_TABLET ],
+			'CT704':									[ 'Carrefour', 'CT704', TYPE_TABLET ],
+			'CT1002':									[ 'Carrefour', 'CT1002', TYPE_TABLET ],
+			'Camangi-Mangrove7':						[ 'Camangi', 'Mangrove 7', TYPE_TABLET ],
+			'WS171':									[ 'Camangi', 'WebStation', TYPE_TABLET ],
+			'IS11CA':									[ 'Casio', 'GzOne IS11CA' ],
+			'C771':										[ 'Casio', 'GzOne Commando' ],
+			'CAT NOVA':									[ 'Cat', 'NOVA', TYPE_TABLET ],
+			'ChangHong-Z-ME':							[ 'ChangHong', 'Z-me' ],
+			'ARMM3V':									[ 'chinaleap', 'ARMM3V', TYPE_TABLET ],
+			'CIUS-7!':									[ 'Cisco', 'Cius', TYPE_TABLET ],
+			'CSL Spice MI300':							[ 'CSL', 'Spice MI300' ],
+			'CSL-MI410':								[ 'CSL', 'Spice MI410' ],
+			'MID1024':									[ 'Coby', 'Kyros MID1024', TYPE_TABLET ],
+			'MID1125':									[ 'Coby', 'Kyros MID1125', TYPE_TABLET ],
+			'MID1126':									[ 'Coby', 'Kyros MID1126', TYPE_TABLET ],
+			'MID7010':									[ 'Coby', 'Kyros MID7010', TYPE_TABLET ],
+			'MID7012':									[ 'Coby', 'Kyros MID7012', TYPE_TABLET ],
+			'MID7015!':									[ 'Coby', 'Kyros MID7015', TYPE_TABLET ],
+			'MID7016':									[ 'Coby', 'Kyros MID7016', TYPE_TABLET ],
+			'MID7020':									[ 'Coby', 'Kyros MID7020', TYPE_TABLET ],
+			'MID7022':									[ 'Coby', 'Kyros MID7022', TYPE_TABLET ],
+			'MID7024':									[ 'Coby', 'Kyros MID7024', TYPE_TABLET ],
+			'MID7025':									[ 'Coby', 'Kyros MID7025', TYPE_TABLET ],
+			'MID7035':									[ 'Coby', 'Kyros MID7035', TYPE_TABLET ],
+			'MID7127':									[ 'Coby', 'Kyros MID7127', TYPE_TABLET ],
+			'MID8024':									[ 'Coby', 'Kyros MID8024', TYPE_TABLET ],
+			'MID8125':									[ 'Coby', 'Kyros MID8125', TYPE_TABLET ],
+			'MID8127':									[ 'Coby', 'Kyros MID8127', TYPE_TABLET ],
+			'Z71':										[ 'Commtiva', 'Z71' ],
+			'V-T100':									[ 'Commtiva', 'V-T100' ],
+			'FIH-FB0':									[ 'Commtiva', 'HD700'],
+			'Coolpad D510':								[ STRINGS_COOLPAD, 'D510' ],
+			'D530':										[ STRINGS_COOLPAD, 'D530' ],
+			'Coolpad D530':								[ STRINGS_COOLPAD, 'D530' ],
+			'D539':										[ STRINGS_COOLPAD, 'D539' ],
+			'Coolpad D539':								[ STRINGS_COOLPAD, 'D539' ],
+			'E239':										[ STRINGS_COOLPAD, 'E239' ],
+			'Coolpad E239':								[ STRINGS_COOLPAD, 'E239' ],
+			'Coolpad N930':								[ STRINGS_COOLPAD, 'N930' ],
+			'N930':										[ STRINGS_COOLPAD, 'N930' ],
+			'Coolpad W706!':							[ STRINGS_COOLPAD, 'W706' ],
+			'Coolpad W708':								[ STRINGS_COOLPAD, 'W708' ],
+			'W711':										[ STRINGS_COOLPAD, 'W711' ],
+			'Coolpad 5210':								[ STRINGS_COOLPAD, '5210' ],
+			'Coolpad 5820':								[ STRINGS_COOLPAD, '5820' ],
+			'5832':										[ STRINGS_COOLPAD, '5832' ],
+			'Coolpad 5832':								[ STRINGS_COOLPAD, '5832' ],
+			'5855':										[ STRINGS_COOLPAD, '5855' ],
+			'Coolpad 5860!':							[ STRINGS_COOLPAD, '5860' ],
+			'5860':										[ STRINGS_COOLPAD, '5860' ],
+			'Coolpad 5870':								[ STRINGS_COOLPAD, '5870' ],
+			'Coolpad 7005':								[ STRINGS_COOLPAD, '7005' ],
+			'Coolpad 7019':								[ STRINGS_COOLPAD, '7019' ],
+			'7260':										[ STRINGS_COOLPAD, '7260' ],
+			'Coolpad 7260!':							[ STRINGS_COOLPAD, '7260' ],
+			'Coolpad 8013':								[ STRINGS_COOLPAD, '8013' ],
+			'Coolpad 8026':								[ STRINGS_COOLPAD, '8026' ],
+			'Coolpad 8809':								[ STRINGS_COOLPAD, '8809' ],
+			'Coolpad 8810':								[ STRINGS_COOLPAD, '8810' ],
+			'8810':										[ STRINGS_COOLPAD, '8810' ],
+			'Coolpad 8811':								[ STRINGS_COOLPAD, '8811' ],
+			'Coolpad 9900':								[ STRINGS_COOLPAD, '9900' ],
+			'ZiiO7':									[ 'Creative', 'ZiiO 7', TYPE_TABLET ],
+			'ZiiLABS ZiiO7':							[ 'Creative', 'ZiiO 7', TYPE_TABLET ],
+			'ZiiLABS ZiiO10 ':							[ 'Creative', 'ZiiO 10', TYPE_TABLET ],
+			'CUBE K8GT A':								[ 'Cube', 'K8GT A', TYPE_TABLET ],
+			'CUBE K8GT B':								[ 'Cube', 'K8GT B', TYPE_TABLET ],
+			'K8GT C':									[ 'Cube', 'K8GT C', TYPE_TABLET ],
+			'K8GT H':									[ 'Cube', 'K8GT H', TYPE_TABLET ],
+			'CUBE K8GT H':								[ 'Cube', 'K8GT H', TYPE_TABLET ],
+			'K8GT W':									[ 'Cube', 'K8GT W', TYPE_TABLET ],
+			'CUBE U8GT':								[ 'Cube', 'U8GT', TYPE_TABLET ],
+			'CUBE U9GT':								[ 'Cube', 'U9GT', TYPE_TABLET ],
+			'CUBE U9GT ?2!':							[ 'Cube', 'U9GT 2', TYPE_TABLET ],
+			'U9GT':										[ 'Cube', 'U9GT', TYPE_TABLET ],
+			'U9GT2!':									[ 'Cube', 'U9GT 2', TYPE_TABLET ],
+			'N90 From moage.com':						[ 'Cube', 'U9GT 2', TYPE_TABLET ],
+			'U9GT S':									[ 'Cube', 'U9GT S', TYPE_TABLET ],
+			'U9GT S A':									[ 'Cube', 'U9GT SA', TYPE_TABLET ],
+			'U9GTS A':									[ 'Cube', 'U9GT SA', TYPE_TABLET ],
+			'U10GT 2':									[ 'Cube', 'U10GT 2', TYPE_TABLET ],
+			'U10GT S':									[ 'Cube', 'U10GT S', TYPE_TABLET ],
+			'U30GT-H':									[ 'Cube', 'U30GT H', TYPE_TABLET ],
+			'CUBE Q7PRO':								[ 'Cube', 'Q7 Pro', TYPE_TABLET ],
+			'CUBE Q7PRO J':								[ 'Cube', 'Q7 Pro', TYPE_TABLET ],
+			'Cydle M7!':								[ 'Cydle', 'M7 MultiPAD', TYPE_TABLET ],
+			'Dell Aero':								[ 'Dell', 'Aero' ],
+			'Dell M01M':								[ 'Dell', 'Mini 5', TYPE_TABLET ],
+			'Dell Streak':								[ 'Dell', 'Streak', TYPE_TABLET ],
+			'001DL':									[ 'Dell', 'Streak', TYPE_TABLET ],
+			'101DL':									[ 'Dell', 'Streak Pro', TYPE_TABLET ],
+			'GS01':										[ 'Dell', 'Streak Pro', TYPE_TABLET ],
+			'Dell Streak Pro':							[ 'Dell', 'Streak Pro', TYPE_TABLET ],
+			'streak7':									[ 'Dell', 'Streak 7', TYPE_TABLET ],
+			'Dell Streak 7':							[ 'Dell', 'Streak 7', TYPE_TABLET ],
+			'Dell Streak 10 Pro':						[ 'Dell', 'Streak 10 Pro', TYPE_TABLET ],
+			'Dell V04B':								[ 'Dell', 'Streak V04B', TYPE_TABLET ],
+			'Dell Venue':								[ 'Dell', 'Venue' ],
+			'Dell XCD35':								[ 'Dell', 'XCD35' ],
+			'XCD35':									[ 'Dell', 'XCD35' ],
+			'iDx7':										[ 'Digma', 'iDx7', TYPE_TABLET ],
+			'iDx10!':									[ 'Digma', 'iDx10', TYPE_TABLET ],
+			'DM009SH':									[ 'Disney Mobile', 'DM009SH' ],
+			'DM010SH':									[ 'Disney Mobile', 'DM010SH' ],
+			'DM012SH':									[ 'Disney Mobile', 'DM012SH' ],
+			'F-08D':									[ 'Disney Mobile', 'F-08D' ],
+			'P-05D':									[ 'Disney Mobile', 'P-05D' ],
+			'Tablet-P27':								[ 'DracoTek', 'P27 Tablet', TYPE_TABLET ],
+			'edgejr':									[ 'EnTourage', 'Pocket eDGe', TYPE_TABLET ],
+			'l97D':										[ 'EPad', 'l97D', TYPE_TABLET ],
+			'M4301':									[ 'Eston', 'MID M4301', 'media' ],
+			'P10AN':									[ 'Exper', 'Easypad P10AN', TYPE_TABLET ],
+			'FIH-F0X':									[ 'FIH', 'F0X' ],
+			'Fly IQ245':								[ 'Fly', 'IQ245 Wizard' ],
+			'Fly IQ260':								[ 'Fly', 'IQ260 BlackBird' ],
+			'Fly IQ441':								[ 'Fly', 'IQ441 Radiance' ],
+			'ISW11F':									[ 'Fujitsu', 'Arrows Z' ],
+			'ISW13F':									[ 'Fujitsu', 'Arrows Z' ],
+			'IS12F':									[ 'Fujitsu', 'Arrows ES' ],
+			'F-01D':									[ 'Fujitsu', 'Arrows Tab LTE', TYPE_TABLET ],
+			'F-03D':									[ 'Fujitsu', 'Arrows Kiss' ],
+			'F-05D':									[ 'Fujitsu', 'Arrows X LTE' ],
+			'F-07D':									[ 'Fujitsu', 'Arrows μ' ],
+			'F-10D':									[ 'Fujitsu', 'Arrows X F-10D' ],
+			'F-12C':									[ 'Fujitsu', 'Globetrotter' ],
+			'f12arc':									[ 'Fujitsu', 'F12arc' ],
+			'M532':										[ 'Fujitsu', 'Stylistic M532', TYPE_TABLET ],
+			'Garminfone':								[ 'Garmin-Asus', 'Garminfone' ],
+			'Garmin-Asus A10':							[ 'Garmin-Asus', 'Nuvifone A10' ],
+			'Garmin-Asus A50':							[ 'Garmin-Asus', 'Nuvifone A50' ],
+			'TPA60W':									[ 'Gateway', 'TPA60W', TYPE_TABLET ],
+			'Geeksphone ZERO':							[ 'Geeksphone', 'ZERO'],
+			'Gemei G2':									[ 'Gemei', 'G2', TYPE_TABLET ],
+			'Gemei G3':									[ 'Gemei', 'G3', TYPE_TABLET ],
+			'Gemei G9':									[ 'Gemei', 'G9', TYPE_TABLET ],
+			'GSmart G1317D':							[ 'Gigabyte', 'GSmart G1317D' ],
+			'GSmart G1342':								[ 'Gigabyte', 'GSmart G1342' ],
+			'GSmart G1345':								[ 'Gigabyte', 'GSmart G1345' ],
+			'Gigabyte TB100':							[ 'Gigabyte', 'TB100', TYPE_TABLET ],
+			'GIO-GiONEE C500':							[ 'Gionee', 'C500' ],
+			'GN105':									[ 'Gionee', 'GN105' ],		
+			'GN200':									[ 'Gionee', 'GN200' ],		
+			'GN205':									[ 'Gionee', 'GN205' ],
+			'Google Ion':								[ 'Google', 'Ion' ],
+			'(HTC )?Nexus ?One!':						[ 'Google', 'Nexus One' ],
+			'(Google )?Nexus S!':						[ 'Google', 'Nexus S' ],
+			'Dooderbutt!':								[ 'Google', 'Nexus S' ],
+			'(Google )?Nexus 7!':						[ 'Google', 'Nexus 7', TYPE_TABLET ],
+			'Haier HW-W910':							[ 'Haier', 'HW-W910' ],
+			'X720D':									[ 'Haipai', 'X720D' ],
+			'SN10T1':									[ 'HANNspree', 'HANNSpad SN10T1', TYPE_TABLET ],
+			'SN10T2':									[ 'HANNspree', 'HANNSpad SN10T2', TYPE_TABLET ],
+			'HannsComb':								[ 'HANNspree', 'HANNSpad', TYPE_TABLET ],
+			'X1':										[ 'HCL', 'ME X1', TYPE_TABLET ],
+			'MID Ser(ai|ia)ls!':						[ 'Herotab', 'C8', TYPE_TABLET ],
+			'HS-9DTB4':									[ 'Hipstreet', '9" Flare tablet', TYPE_TABLET ],
+			'COSMO DUO':								[ 'Hiscreen', 'Cosmo DUO', TYPE_TABLET ],
+			'HS-U8':									[ 'Hisense', 'U8' ],
+			'HS-T92':									[ 'Hisense', 'T92' ],
+			'HS-T96':									[ 'Hisense', 'T96' ],
+			'HS-E860':									[ 'Hisense', 'E860' ],
+			'E860':										[ 'Hisense', 'E860' ],
+			'HS-E910':									[ 'Hisense', 'E910' ],
+			'HS-E920':									[ 'Hisense', 'E920' ],
+			'HS-EG900':									[ 'Hisense', 'EG900' ],
+			'HS-EG906':									[ 'Hisense', 'EG906' ],
+			'HS-ET919':									[ 'Hisense', 'ET919' ],
+			'EG968B':									[ 'Hisense', 'EG968B' ],
+			'HKPHONE H8-3G':							[ 'HKPhone', 'H8 3G' ],
+			'HOSIN U2':									[ 'Hosin', 'U2' ],
+			'(HP )?Touchpad!':							[ 'HP', 'TouchPad', TYPE_TABLET ],
+			'(cm|aokp) tenderloin!':					[ 'HP', 'TouchPad', TYPE_TABLET ],
+			'Amaze 4G':									[ STRINGS_HTC, 'Amaze 4G' ],
+			'HTC (Amaze|Ruby)!':						[ STRINGS_HTC, 'Amaze 4G' ],
+			'HTC (Aria|Liberty)!':						[ STRINGS_HTC, 'Aria' ],
+			'HTC A63(66|80)!':							[ STRINGS_HTC, 'Aria' ],
+			'HTC Bee':									[ STRINGS_HTC, 'Bee' ],
+			'HTC ChaCha!':								[ STRINGS_HTC, 'ChaCha' ],
+			'HTC A810e':								[ STRINGS_HTC, 'ChaCha' ],
+			'HTC A9188':								[ STRINGS_HTC, 'Cullinan' ],
+			'HTC Desire C':								[ STRINGS_HTC, 'Desire C' ],
+			'HTC Desire ?HD!':							[ STRINGS_HTC, 'Desire HD' ],
+			'HTC A91(91|92)!':							[ STRINGS_HTC, 'Desire HD' ],
+			'HTC Desire ?S( |$)!':						[ STRINGS_HTC, 'Desire S' ],
+			'HTC S510(b|e)!':							[ STRINGS_HTC, 'Desire S' ],
+			'HTC Desire Saga':							[ STRINGS_HTC, 'Desire S' ],
+			'HTC Desire V':								[ STRINGS_HTC, 'Desire V' ],
+			'HTC T328w':								[ STRINGS_HTC, 'Desire V' ],
+			'HTC Desire VC':							[ STRINGS_HTC, 'Desire VC' ],
+			'HTC T328d':								[ STRINGS_HTC, 'Desire VC' ],
+			'HTC Desire VT':							[ STRINGS_HTC, 'Desire VT' ],
+			'HTC T328t':								[ STRINGS_HTC, 'Desire VT' ],
+			'HTC Desire ?Z!':							[ STRINGS_HTC, 'Desire Z' ],
+			'HTC Vision':								[ STRINGS_HTC, 'Desire Z' ],
+			'HTC A72(71|72)!':							[ STRINGS_HTC, 'Desire Z' ],
+			'HTC Desire!':								[ STRINGS_HTC, 'Desire' ],
+			'HTC Bravo':								[ STRINGS_HTC, 'Desire' ],
+			'HTC A81(81|83)!':							[ STRINGS_HTC, 'Desire' ],
+			'HTC ?X06HT!':								[ STRINGS_HTC, 'Desire' ],
+			'HTC Dream':								[ STRINGS_HTC, 'Dream' ],
+			'HTC S710d':								[ STRINGS_HTC, 'Droid Incredible 2' ],
+			'HTC Incredible 2':							[ STRINGS_HTC, 'Droid Incredible 2' ],
+			'HTC EVO ?3D!':								[ STRINGS_HTC, 'EVO 3D' ],
+			'HTC X51(5a|5c|5d|5m)!':					[ STRINGS_HTC, 'EVO 3D' ],
+			'HTC EVO 4G\+!':							[ STRINGS_HTC, 'EVO 4G+' ],
+			'HTC X515e':								[ STRINGS_HTC, 'EVO 4G+' ],
+			'HTC EVO 4G':								[ STRINGS_HTC, 'EVO 4G' ],
+			'HTC ?(EVO )?Design ?4G!':					[ STRINGS_HTC, 'EVO Design 4G' ],		
+			'HTC C715c':								[ STRINGS_HTC, 'EVO Design 4G' ],
+			'HTC EVO Shift!':							[ STRINGS_HTC, 'EVO Shift' ],
+			'HTC Explorer!':							[ STRINGS_HTC, 'Explorer' ],
+			'HTC A31(0b|0e)!':							[ STRINGS_HTC, 'Explorer' ],
+			'HTC Flyer!':								[ STRINGS_HTC, 'Flyer', TYPE_TABLET ],
+			'HTC P51(0e|2|5e)!':						[ STRINGS_HTC, 'Flyer', TYPE_TABLET ],
+			'HTC Gratia!':								[ STRINGS_HTC, 'Gratia' ],
+			'HTC A6380':								[ STRINGS_HTC, 'Gratia' ],
+			'HTC HD':									[ STRINGS_HTC, 'HD' ],
+			'HTC HD2!':									[ STRINGS_HTC, 'HD2' ],
+			'HTC T8585':								[ STRINGS_HTC, 'HD2' ],
+			'HTC HD7!':									[ STRINGS_HTC, 'HD7' ],
+			'HTC T9299!':								[ STRINGS_HTC, 'HD7' ],
+			'HTC HD7S!':								[ STRINGS_HTC, 'HD7s' ],
+			'HTC T(93|98)99!':							[ STRINGS_HTC, 'HD7s' ],
+			'VitMod ExtraLite 1.6.5.fullodex for HTC HD7 Pro':		[ STRINGS_HTC, 'HD7 Pro' ],
+			'HTC HERO200':								[ STRINGS_HTC, 'Hero 200' ],			/* Sprint */
+			'HTC Hero S':								[ STRINGS_HTC, 'Hero S' ],				/* US Cellular */
+			'HTC Hero!':								[ STRINGS_HTC, 'Hero' ],
+			'HTC IMAGIO':								[ STRINGS_HTC, 'Imagio' ],
+			'HTC Incredible':							[ STRINGS_HTC, 'Incredible' ],
+			'HTC Incredible ?S!':						[ STRINGS_HTC, 'Incredible S' ],
+			'HTC Vivo':									[ STRINGS_HTC, 'Incredible S' ],
+			'HTC S710e!':								[ STRINGS_HTC, 'Incredible S' ],
+			'HTC Innovation':							[ STRINGS_HTC, 'Innovation' ],
+			'HTC (HD7 )?Inspire!':						[ STRINGS_HTC, 'Inspire 4G' ],
+			'HTC J Z321e':								[ STRINGS_HTC, 'J' ],
+			'HTC P715a':								[ STRINGS_HTC, 'Jetstream', TYPE_TABLET ],
+			'HTC Legend':								[ STRINGS_HTC, 'Legend' ],
+			'HTC Magic':								[ STRINGS_HTC, 'Magic' ],
+			'HTC Sapphire':								[ STRINGS_HTC, 'Magic' ],
+			'HTC Lexikon':								[ STRINGS_HTC, 'Merge' ],
+			'HTC One S':								[ STRINGS_HTC, 'One S' ],
+			'HTC Z(52|56)0e!':							[ STRINGS_HTC, 'One S' ],
+			'HTC One V':								[ STRINGS_HTC, 'One V' ],
+			'HTC T320e':								[ STRINGS_HTC, 'One V' ],
+			'HTC H2000C':								[ STRINGS_HTC, 'One V' ],
+			'HTC One X':								[ STRINGS_HTC, 'One X' ],
+			'HTC Endeavour!':							[ STRINGS_HTC, 'One X' ],
+			'HTC S720e':								[ STRINGS_HTC, 'One X' ],
+			'HTC One XL':								[ STRINGS_HTC, 'One XL' ],
+			'HTC S720t':								[ STRINGS_HTC, 'One XT' ],
+			'HTC Raider!':								[ STRINGS_HTC, 'Raider 4G' ],
+			'HTC Holiday':								[ STRINGS_HTC, 'Raider 4G' ],
+			'HTC X710(a|e|s)!':							[ STRINGS_HTC, 'Raider 4G' ],
+			'HTC PH39100':								[ STRINGS_HTC, 'Raider 4G' ],
+			'HTC Rezound':								[ STRINGS_HTC, 'Rezound' ],
+			'HTC Rhyme!':								[ STRINGS_HTC, 'Rhyme' ],
+			'HTC Bliss!':								[ STRINGS_HTC, 'Rhyme' ],
+			'HTC S510b':								[ STRINGS_HTC, 'Rhyme' ],
+			'HTC Salsa!':								[ STRINGS_HTC, 'Salsa' ],	
+			'HTC C510e':								[ STRINGS_HTC, 'Salsa' ],
+			'HTC Sensation.*XE!':						[ STRINGS_HTC, 'Sensation XE' ],
+			'HTC .*Z715(a|e)!':							[ STRINGS_HTC, 'Sensation XE' ],
+			'HTC Sensation.*XL!':						[ STRINGS_HTC, 'Sensation XL' ],
+			'HTC Runnymede':							[ STRINGS_HTC, 'Sensation XL' ],
+			'HTC .*X315(b|e)!':							[ STRINGS_HTC, 'Sensation XL' ],
+			'HTC G21!':									[ STRINGS_HTC, 'Sensation XL' ],
+			'HTC Sensation!':							[ STRINGS_HTC, 'Sensation' ],
+			'HTC Pyramid!':								[ STRINGS_HTC, 'Sensation' ],
+			'HTC .*Z710(a|e|t)?!':						[ STRINGS_HTC, 'Sensation' ],
+			'HTC G14!':									[ STRINGS_HTC, 'Sensation' ],
+			'HTC Status':								[ STRINGS_HTC, 'Status' ],
+			'HTC PH06130':								[ STRINGS_HTC, 'Status' ],
+			'HTC Tattoo!':								[ STRINGS_HTC, 'Tattoo' ],
+			'HTC Click':								[ STRINGS_HTC, 'Tattoo' ],
+			'HTC A3288':								[ STRINGS_HTC, 'Tattoo' ],
+			'HTC A9188':								[ STRINGS_HTC, 'Tianxi' ],
+			'HTC X310e':								[ STRINGS_HTC, 'Titan' ],
+			'HTC T7373':								[ STRINGS_HTC, 'Touch Pro II' ],
+			'HTC ThunderBolt':							[ STRINGS_HTC, 'ThunderBolt'],	
+			'HTC Mecha':								[ STRINGS_HTC, 'ThunderBolt'],
+			'HTC Velocity!':							[ STRINGS_HTC, 'Velocity 4G'],
+			'HTC Wildfire ?S!':							[ STRINGS_HTC, 'Wildfire S' ],	
+			'HTC .*A510(b|c|e)!':						[ STRINGS_HTC, 'Wildfire S' ],
+			'HTC Wildfire!':							[ STRINGS_HTC, 'Wildfire' ],
+			'HTC .*A33(33|66|80)!':						[ STRINGS_HTC, 'Wildfire' ],
+			'HTC A6390':								[ STRINGS_HTC, 'A6390' ],
+			'HTC A8180':								[ STRINGS_HTC, 'A8180' ],
+			'HTC PG762':								[ STRINGS_HTC, 'PG762' ],
+			'HTC S610d':								[ STRINGS_HTC, 'S610d' ],
+			'HTC S715e':								[ STRINGS_HTC, 'S715e' ],
+			'HTC Z510d':								[ STRINGS_HTC, 'Z510d' ],
+			'HTC VLE U':								[ STRINGS_HTC, 'One S' ],
+			'HTC VLE#U':								[ STRINGS_HTC, 'One S' ],
+			'HTC VIE U':								[ STRINGS_HTC, 'One S' ],
+			'HTC EVA UL':								[ STRINGS_HTC, 'One V' ],
+			'HTC DLX U':								[ STRINGS_HTC, 'One X5' ],
+			'HTC6435LVW 4G':							[ STRINGS_HTC, 'One X5' ],
+			'HTC ENR U':								[ STRINGS_HTC, 'One X' ],
+			'ENR U':									[ STRINGS_HTC, 'One X' ],
+			'EndeavorU':								[ STRINGS_HTC, 'One X' ],
+			'Liberty':									[ STRINGS_HTC, 'Aria' ],
+			'Desire HD!':								[ STRINGS_HTC, 'Desire HD' ],
+			'Desire ?S!':								[ STRINGS_HTC, 'Desire S' ],
+			'Desire Z':									[ STRINGS_HTC, 'Desire Z' ],
+			'Desire!':									[ STRINGS_HTC, 'Desire' ],
+			'Dream':									[ STRINGS_HTC, 'Dream' ],
+			'Droid Incredible':							[ STRINGS_HTC, 'Droid Incredible' ],
+			'EVO':										[ STRINGS_HTC, 'EVO' ],
+			'Evo HD2':									[ STRINGS_HTC, 'EVO HD' ],
+			'EVO ?3D!':									[ STRINGS_HTC, 'EVO 3D' ],
+			'EVO 4G':									[ STRINGS_HTC, 'EVO 4G' ],
+			'photon':									[ STRINGS_HTC, 'HD mini' ],
+			'GinDream/GinMagic':						[ STRINGS_HTC, 'Dream' ],
+			'HD2':										[ STRINGS_HTC, 'HD2' ],
+			'HD7  Pro':									[ STRINGS_HTC, 'HD7 Pro' ],
+			'Hero':										[ STRINGS_HTC, 'Hero' ],
+			'HERO CDMA':								[ STRINGS_HTC, 'Hero' ],
+			'HERO200':									[ STRINGS_HTC, 'Hero 200' ],
+			'Incredible':								[ STRINGS_HTC, 'Droid Incredible' ],	/* Verizon */
+			'Incredible 2':								[ STRINGS_HTC, 'Droid Incredible 2' ],	/* Verizon */
+			'Incredible ?S!':							[ STRINGS_HTC, 'Incredible S' ],
+			'Inspire HD':								[ STRINGS_HTC, 'Inspire 4G' ],
+			'Inspire 4G':								[ STRINGS_HTC, 'Inspire 4G' ],
+			'Legend':									[ STRINGS_HTC, 'Legend' ],
+			'NexusHD2':									[ STRINGS_HTC, 'HD2' ],
+			'Nexus HD2':								[ STRINGS_HTC, 'HD2' ],
+			'Docomo HT-03A':							[ STRINGS_HTC, 'Magic' ],
+			'SiRF Dream':								[ STRINGS_HTC, 'Dream' ],
+			'MIUI.us Sensation 4G':						[ STRINGS_HTC, 'Sensation 4G' ],
+			'SensationXE!':								[ STRINGS_HTC, 'Sensation XE' ],
+			'SensationXL!':								[ STRINGS_HTC, 'Sensation XL' ],
+			'Sensation!':								[ STRINGS_HTC, 'Sensation' ],
+			'Pyramid':									[ STRINGS_HTC, 'Sensation' ],
+			'TripNiCE Pyramid':							[ STRINGS_HTC, 'Sensation' ],
+			'Click':									[ STRINGS_HTC, 'Tattoo' ],
+			'Wildfire S!':								[ STRINGS_HTC, 'Wildfire S' ],
+			'Wildfire!':								[ STRINGS_HTC, 'Wildfire' ],
+			'Sprint APX515CKT':							[ STRINGS_HTC, 'EVO 3D' ],
+			'Sprint APA9292KT':							[ STRINGS_HTC, 'EVO 4G' ],
+			'Sprint APA7373KT':							[ STRINGS_HTC, 'EVO Shift 4G' ],
+			'Sprint APC715CKT':							[ STRINGS_HTC, 'EVO Design 4G' ],
+			'A3380':									[ STRINGS_HTC, 'Wildfire' ],
+			'A6277':									[ STRINGS_HTC, 'Hero' ],
+			'a7272':									[ STRINGS_HTC, 'Desire Z' ],					
+			'A7272+(HTC DesireZ)':						[ STRINGS_HTC, 'Desire Z' ],					
+			'S31HT':									[ STRINGS_HTC, 'Aria' ],
+			'S710d':									[ STRINGS_HTC, 'Droid Incredible 2' ],
+			'S710D':									[ STRINGS_HTC, 'Droid Incredible 2' ],
+			'X06HT':									[ STRINGS_HTC, 'Desire' ],
+			'001HT':									[ STRINGS_HTC, 'Desire HD' ],
+			'X325a':									[ STRINGS_HTC, 'One X' ],
+			'Z520m':									[ STRINGS_HTC, 'One S' ],
+			'Z710':										[ STRINGS_HTC, 'Sensation' ],
+			'Z710e':									[ STRINGS_HTC, 'Sensation' ],
+			'T9199h':									[ STRINGS_HTC, 'T9199h' ],
+			'ADR6200':									[ STRINGS_HTC, 'Droid Eris' ],
+			'ADR6300':									[ STRINGS_HTC, 'Droid Incredible' ],
+			'ADR6325VW':								[ STRINGS_HTC, 'Merge' ],	
+			'ADR6330VW':								[ STRINGS_HTC, 'Rhyme' ],	
+			'ADR6350':									[ STRINGS_HTC, 'Droid Incredible 2' ],
+			'ADR6400L!':								[ STRINGS_HTC, 'Thunderbolt 4G' ],
+			'ADR6410LVW!':								[ STRINGS_HTC, 'Fireball' ],
+			'ADR6425LVW!':								[ STRINGS_HTC, 'Rezound' ],
+			'Coquettish Red':							[ STRINGS_HTC, 'Rezound' ],
+			'PB99400':									[ STRINGS_HTC, 'Droid Incredible' ],	
+			'pcdadr6350':								[ STRINGS_HTC, 'Droid Incredible 2' ],
+			'PC36100':									[ STRINGS_HTC, 'EVO 4G' ],
+			'PG06100':									[ STRINGS_HTC, 'EVO Shift 4G' ],
+			'PG41200':									[ STRINGS_HTC, 'EVO View 4G', TYPE_TABLET ],
+			'PG86100!':									[ STRINGS_HTC, 'EVO 3D' ],
+			'PH44100':									[ STRINGS_HTC, 'EVO Design 4G' ],
+			'PJ83100':									[ STRINGS_HTC, 'One X' ],
+			'PM63100':									[ STRINGS_HTC, 'One X+' ],
+			'ISW11HT':									[ STRINGS_HTC, 'EVO 4G' ],
+			'ISW12HT':									[ STRINGS_HTC, 'EVO 3D' ],
+			'ISW13HT':									[ STRINGS_HTC, 'J' ],
+			'USCCADR6275US!':							[ STRINGS_HTC, 'Desire' ],
+			'USCCADR6285US!':							[ STRINGS_HTC, 'Hero S' ],
+			'USCCADR6325US!':							[ STRINGS_HTC, 'Merge' ],
+			'MediaPad':									[ STRINGS_HUAWEI, 'MediaPad', TYPE_TABLET ],
+			'Huawei MediaPad':							[ STRINGS_HUAWEI, 'MediaPad', TYPE_TABLET ],
+			'Huawei S7-312u':							[ STRINGS_HUAWEI, 'MediaPad', TYPE_TABLET ],
+			'MediaPad 7 Lite':							[ STRINGS_HUAWEI, 'MediaPad 7 Lite', TYPE_TABLET ],
+			'MediaPad 10 FHD':							[ STRINGS_HUAWEI, 'MediaPad 10', TYPE_TABLET ],
+			'Huawei C8500!':							[ STRINGS_HUAWEI, 'C8500' ],
+			'Huawei C8600':								[ STRINGS_HUAWEI, 'C8600' ],
+			'Huawei C8650!':							[ STRINGS_HUAWEI, 'C8650' ],
+			'Huawei C8800':								[ STRINGS_HUAWEI, 'IDEOS X5' ],
+			'Huawei C8810':								[ STRINGS_HUAWEI, 'Ascend G300' ],
+			'Huawei C8812':								[ STRINGS_HUAWEI, 'Ascend C8812' ],
+			'Huawei C8825D':							[ STRINGS_HUAWEI, 'Ascend G330C' ],
+			'Huawei C8860E':							[ STRINGS_HUAWEI, 'Honor' ],
+			'Huawei G300':								[ STRINGS_HUAWEI, 'Ascend G300' ],
+			'Huawei M835':								[ STRINGS_HUAWEI, 'M835' ],
+			'Huawei M860':								[ STRINGS_HUAWEI, 'Ascend' ],
+			'Huawei M920':								[ STRINGS_HUAWEI, 'M920' ],
+			'Huawei M921':								[ STRINGS_HUAWEI, 'M921' ],
+			'Huawei M931':								[ STRINGS_HUAWEI, 'M931' ],
+			'Huawei S8520':								[ STRINGS_HUAWEI, 'S8520' ],
+			'Huawei S8600':								[ STRINGS_HUAWEI, 'S8600' ],
+			'Huawei T8300':								[ STRINGS_HUAWEI, 'T8300' ],
+			'Huawei T8600':								[ STRINGS_HUAWEI, 'T8600' ],
+			'Huawei T8950':								[ STRINGS_HUAWEI, 'Honor+' ],
+			'Huawei U8220':								[ STRINGS_HUAWEI, 'U8220' ],
+			'Huawei U8500':								[ STRINGS_HUAWEI, 'IDEOS X2' ],
+			'Huawei ?U8650!':							[ STRINGS_HUAWEI, 'Sonic' ],
+			'Huawei U8815':								[ STRINGS_HUAWEI, 'Ascend G300' ],
+			'Huawei U8850':								[ STRINGS_HUAWEI, 'Vision' ],
+			'Huawei U8652':								[ STRINGS_HUAWEI, 'Sonic' ],
+			'Huawei U8661':								[ STRINGS_HUAWEI, 'Sonic+' ],
+			'Huawei U8800!':							[ STRINGS_HUAWEI, 'IDEOS X5' ],
+			'Huawei U8818':								[ STRINGS_HUAWEI, 'Ascend G300' ],
+			'Huawei U8825D':							[ STRINGS_HUAWEI, 'Ascend G330D' ],
+			'Huawei U9000':								[ STRINGS_HUAWEI, 'Ascend X' ],
+			'Huawei U9510E':							[ STRINGS_HUAWEI, 'Ascend D quad' ],
+			'Huawei IDEOS U8500':						[ STRINGS_HUAWEI, 'IDEOS X2' ],
+			'Huawei IDEOS U8650':						[ STRINGS_HUAWEI, 'Sonic' ],
+			'Huawei IDEOS X3':							[ STRINGS_HUAWEI, 'IDEOS X3' ],
+			'Huawei Ideos X5!':							[ STRINGS_HUAWEI, 'IDEOS X5' ],
+			'Huawei SONIC':								[ STRINGS_HUAWEI, 'Sonic' ],
+			'Huawei 8100-9':							[ STRINGS_HUAWEI, 'U8100' ],
+			'FUSIONideos':								[ STRINGS_HUAWEI, 'IDEOS' ],
+			'Gnappo Ideos':								[ STRINGS_HUAWEI, 'IDEOS' ],
+			'Ideos':									[ STRINGS_HUAWEI, 'IDEOS' ],
+			'IDEOS X5':									[ STRINGS_HUAWEI, 'IDEOS X5' ],
+			'IDEOS S7!':								[ STRINGS_HUAWEI, 'IDEOS S7', TYPE_TABLET ],
+			'Huawei S7':								[ STRINGS_HUAWEI, 'IDEOS S7', TYPE_TABLET ],
+			'SONIC':									[ STRINGS_HUAWEI, 'Sonic' ],
+			'Kyivstar Aqua':							[ STRINGS_HUAWEI, 'Sonic' ],
+			'Lucky Ultra Sonic U8650':					[ STRINGS_HUAWEI, 'Sonic' ],
+			'Turkcell T20':								[ STRINGS_HUAWEI, 'Sonic' ],
+			'MTC 950':									[ STRINGS_HUAWEI, 'U8160' ],
+			'MTC 955':									[ STRINGS_HUAWEI, 'Sonic' ],
+			'MTC Evo':									[ STRINGS_HUAWEI, 'C8500' ],
+			'MTC Android':								[ STRINGS_HUAWEI, 'U8110' ],
+			'S31HW':									[ STRINGS_HUAWEI, 'Pocket WiFi S' ],
+			'S41HW':									[ STRINGS_HUAWEI, 'Pocket WiFi S II' ],
+			'007HW':									[ STRINGS_HUAWEI, 'Vision' ],	
+			'201HW':									[ STRINGS_HUAWEI, 'Ascend P1' ],
+			'UM840':									[ STRINGS_HUAWEI, 'Evolution' ],	
+			'M860':										[ STRINGS_HUAWEI, 'Ascend' ],
+			'M865':										[ STRINGS_HUAWEI, 'Ascend II' ],
+			'M886':										[ STRINGS_HUAWEI, 'Glory' ],
+			'C8150':									[ STRINGS_HUAWEI, 'IDEOS' ],
+			'C8500!':									[ STRINGS_HUAWEI, 'C8500' ],
+			'C8600':									[ STRINGS_HUAWEI, 'C8600' ],
+			'C8650':									[ STRINGS_HUAWEI, 'C8650' ],
+			'C8800':									[ STRINGS_HUAWEI, 'C8800' ],
+			'C8810':									[ STRINGS_HUAWEI, 'Ascend G300C' ],
+			'C8812':									[ STRINGS_HUAWEI, 'Ascend C8812' ],
+			'S8600':									[ STRINGS_HUAWEI, 'S8600' ],
+			'U8100':									[ STRINGS_HUAWEI, 'U8100' ],
+			'U8110':									[ STRINGS_HUAWEI, 'U8110' ],
+			'U8120':									[ STRINGS_HUAWEI, 'U8120' ],
+			'U8180':									[ STRINGS_HUAWEI, 'IDEOS X1' ],
+			'U8220':									[ STRINGS_HUAWEI, 'Pulse' ],
+			'U8300':									[ STRINGS_HUAWEI, 'U8300' ],
+			'U8350':									[ STRINGS_HUAWEI, 'Boulder' ],
+			'U8150':									[ STRINGS_HUAWEI, 'IDEOS' ],
+			'U8160':									[ STRINGS_HUAWEI, 'U8160' ],
+			'U8180':									[ STRINGS_HUAWEI, 'IDEOS X1' ],
+			'U8500':									[ STRINGS_HUAWEI, 'IDEOS X2' ],
+			'U8500 HiQQ':								[ STRINGS_HUAWEI, 'U8500 HiQQ Edition' ],
+			'U8510':									[ STRINGS_HUAWEI, 'IDEOS X3' ],
+			'U8650!':									[ STRINGS_HUAWEI, 'Sonic' ],
+			'U8660':									[ STRINGS_HUAWEI, 'Sonic' ],
+			'U8800 ?Pro!':								[ STRINGS_HUAWEI, 'IDEOS X5 Pro' ],
+			'U8800!':									[ STRINGS_HUAWEI, 'IDEOS X5' ],
+			'U8815':									[ STRINGS_HUAWEI, 'Ascend G300' ],
+			'U8818':									[ STRINGS_HUAWEI, 'Ascend G300' ],
+			'U8820':									[ STRINGS_HUAWEI, 'Titan' ],
+			'U8850':									[ STRINGS_HUAWEI, 'Vision' ],
+			'U8860':									[ STRINGS_HUAWEI, 'Honor' ],
+			'U9000':									[ STRINGS_HUAWEI, 'Ascend X' ],
+			'U9200!':									[ STRINGS_HUAWEI, 'Ascend P1' ],
+			'U9500':									[ STRINGS_HUAWEI, 'Ascend D1' ],
+			'U9501L':									[ STRINGS_HUAWEI, 'Ascend D LTE' ],
+			'U9510!':									[ STRINGS_HUAWEI, 'Ascend D quad' ],
+			'Comet':									[ STRINGS_HUAWEI, 'Comet' ],
+			'GS02':										[ STRINGS_HUAWEI, 'Honor' ],
+			'GS03':										[ STRINGS_HUAWEI, 'Ascend P1' ],
+			'DroniX-0.5':								[ STRINGS_HUAWEI, 'U8180' ],
+			'MTS-SP101':								[ STRINGS_HUAWEI, 'C8511' ],
+			'TSP21':									[ STRINGS_HUAWEI, 'U8110' ],
+			'HW-01E':									[ STRINGS_HUAWEI, 'Ascend HW-01E' ],								
+			'HYUNDAI H6':								[ 'Hyundai', 'Storm H6' ],
+			'iBall Slide i7011':						[ 'iBall', 'Slide i7011' ],
+			'NetTAB RUNE':								[ 'IconBit', 'NetTab Rune', TYPE_TABLET ],
+			'D70W':										[ 'Icoo', 'D70W', TYPE_TABLET ],
+			'D80':										[ 'Icoo', 'D80', TYPE_TABLET ],
+			'INFOBAR A01':								[ 'iida', 'INFOBAR A01' ],
+			'M009F':									[ 'Infotmic', 'M009F' ],
+			'AZ210A':									[ 'Intel', 'AZ210A' ],
+			'AZ210B':									[ 'Intel', 'AZ210B' ],
+			'AZ510':									[ 'Intel', 'AZ510' ],
+			'greenridge':								[ 'Intel', 'Green Ridge', TYPE_TABLET ],
+			'INQ Cloud Touch':							[ 'INQ', 'Cloud Touch' ],
+			'ILT-MX100':								[ 'iRiver', 'Tab', TYPE_TABLET ],
+			'IVIO_DE38':								[ 'Ivio', 'DE38' ],
+			'JY-G2':									[ 'Jiayu', 'G2' ],
+			'JXD S601WIFI':								[ 'JXD', 'S601 WIFI', 'media' ],
+			'A2':										[ 'KakaTech', 'A2' ],
+			'D91':										[ 'KK', 'D91', TYPE_TABLET ],
+			'K080':										[ 'Kobo', 'K080', TYPE_EREADER ],
+			'A106':										[ 'koobee', 'A160' ],
+			'KPT A9':									[ 'KPT', 'A9' ],
+			'EV-S100':									[ 'Kttech', 'Take EV-S100' ],
+			'KM-S120':									[ 'Kttech', 'Take 2 KM-S120' ],
+			'KM-S200':									[ 'Kttech', 'Take Janus KM-S200' ],
+			'KM-S220':									[ 'Kttech', 'Take Tachy KM-S220' ],
+			'Kyobo mirasol eReader':					[ 'Kyobo', TYPE_EREADER, TYPE_EREADER ],
+			'ISW11K':									[ 'Kyocera', 'Digno' ],
+			'JC-KSP8000':								[ 'Kyocera', 'Echo' ],
+			'KSP8000':									[ 'Kyocera', 'Echo' ],
+			'Zio':										[ 'Kyocera', 'Zio' ],
+			'C5155':									[ 'Kyocera', 'C5155' ],
+			'C5170':									[ 'Kyocera', 'C5170' ],
+			'M9300':									[ 'Kyocera', 'M9300' ],
+			'K-Touch E619':								[ 'K-Touch', 'E619' ],
+			'E800':										[ 'K-Touch', 'E800' ],
+			'W606':										[ 'K-Touch', 'W606' ],
+			'K-Touch W619':								[ 'K-Touch', 'W619' ],
+			'K-Touch W650':								[ 'K-Touch', 'W650' ],
+			'W700':										[ 'K-Touch', 'W700' ],
+			'K-Touch W760':								[ 'K-Touch', 'W760' ],
+			'W800':										[ 'K-Touch', 'W800' ],
+			'W806':										[ 'K-Touch', 'W806' ],
+			'W808':										[ 'K-Touch', 'W808' ],
+			'W810':										[ 'K-Touch', 'W810' ],
+			'X900':										[ 'Lava', 'XOLO X900' ],
+			'ThinkPad( Tablet)?!':						[ STRINGS_LENOVO, 'ThinkPad Tablet', TYPE_TABLET ],
+			'(Ideapad )?K1!':							[ STRINGS_LENOVO, 'IdeaPad K1', TYPE_TABLET ],
+			'Ideapad S10-3T':							[ STRINGS_LENOVO, 'IdeaPad S10-3T', TYPE_TABLET ],
+			'S2005A-H':									[ STRINGS_LENOVO, 'S2005A' ],
+			'IdeaTab ?S2007(A-D)!':						[ STRINGS_LENOVO, 'IdeaTab S2007A', TYPE_TABLET ],
+			'IdeaTab ?V2007(A|A-D-I)!':					[ STRINGS_LENOVO, 'IdeaTab V2007A', TYPE_TABLET ],
+			'IdeaTab ?V2010(A)!':						[ STRINGS_LENOVO, 'IdeaTab V2010A', TYPE_TABLET ],
+			'IdeaTab ?A2107(A-H)!':						[ STRINGS_LENOVO, 'IdeaTab V2107A', TYPE_TABLET ],
+			'A1 07':									[ STRINGS_LENOVO, 'LePad', TYPE_TABLET ],
+			'lepad 001b':								[ STRINGS_LENOVO, 'LePad', TYPE_TABLET ],
+			'lepad 001n':								[ STRINGS_LENOVO, 'LePad', TYPE_TABLET ],
+			'(Lenovo )?3GC101!':						[ STRINGS_LENOVO, 'LePhone 3GC101' ],
+			'(Lenovo )?3GW100!':						[ STRINGS_LENOVO, 'LePhone 3GW100' ],
+			'(Lenovo |Lephone )?3GW101!':				[ STRINGS_LENOVO, 'LePhone 3GW101' ],
+			'Lenovo A1-32AB0':							[ STRINGS_LENOVO, 'LePhone A1-32AB0' ],
+			'Lenovo S1-37AH0':							[ STRINGS_LENOVO, 'LePhone S1-37AH0' ],
+			'S1 37AHO':									[ STRINGS_LENOVO, 'LePhone S1-37AH0' ],
+			'Lenovo S2-38AH0':							[ STRINGS_LENOVO, 'LePhone S2-38AH0' ],
+			'Lenovo S2-38AT0':							[ STRINGS_LENOVO, 'LePhone S2-38AT0' ],
+			'Lenovo A288t':								[ STRINGS_LENOVO, 'LePhone A288' ],
+			'Lenovo A300':								[ STRINGS_LENOVO, 'LePhone A300' ],
+			'Lenovo A366t':								[ STRINGS_LENOVO, 'LePhone A366' ],
+			'Lenovo A390e':								[ STRINGS_LENOVO, 'LePhone A390' ],
+			'Lenovo A500':								[ STRINGS_LENOVO, 'LePhone A500' ],
+			'Lenovo A520!':								[ STRINGS_LENOVO, 'LePhone A520' ],
+			'Lenovo A668t':								[ STRINGS_LENOVO, 'LePhone A668' ],
+			'Lenovo A698t':								[ STRINGS_LENOVO, 'LePhone A698' ],
+			'Lenovo A750':								[ STRINGS_LENOVO, 'LePhone A750' ],
+			'Lenovo A780':								[ STRINGS_LENOVO, 'LePhone A780' ],
+			'Lenovo A789':								[ STRINGS_LENOVO, 'LePhone A789' ],
+			'Lenovo A790e':								[ STRINGS_LENOVO, 'LePhone A790' ],
+			'Lenovo K860':								[ STRINGS_LENOVO, 'LePhone K860' ],
+			'Lenovo P70':								[ STRINGS_LENOVO, 'LePhone P70' ],
+			'Lenovo P700!':								[ STRINGS_LENOVO, 'LePhone P700' ],
+			'Lenovo S560':								[ STRINGS_LENOVO, 'S560' ],
+			'Lenovo S680':								[ STRINGS_LENOVO, 'S680' ],
+			'Lenovo S850e':								[ STRINGS_LENOVO, 'S850' ],
+			'Lenovo S880':								[ STRINGS_LENOVO, 'S880' ],
+			'Lenovo ?S899!':							[ STRINGS_LENOVO, 'S899' ],
+			'A30t':										[ STRINGS_LENOVO, 'A30t' ],
+			'Lenovo A60+?!':							[ STRINGS_LENOVO, 'A60' ],
+			'Lenovo A65':								[ STRINGS_LENOVO, 'A65' ],
+			'Lenovo A66t':								[ STRINGS_LENOVO, 'A66t' ],
+			'Lenovo A68e':								[ STRINGS_LENOVO, 'A68e' ],
+			'Lenovo K800':								[ STRINGS_LENOVO, 'K800' ],
+			'IDEA TV T100':								[ STRINGS_LENOVO, 'IDEA TV', TYPE_TELEVISION ],
+			'IDEA TV K91':								[ STRINGS_LENOVO, 'IDEA TV', TYPE_TELEVISION ],
+			'TC970':									[ 'Le Pan', 'TC970', TYPE_TABLET ],
+			'LePanII':									[ 'Le Pan', 'II', TYPE_TABLET ],
+			'LG-C555':									[ STRINGS_LG, 'Optimus Chat' ],
+			'LG-C660!':									[ STRINGS_LG, 'Optimus Pro' ],
+			'LG-C729':									[ STRINGS_LG, 'DoublePlay' ],
+			'LG-C800G':									[ STRINGS_LG, 'Eclypse' ],
+			'LG-CX670':									[ STRINGS_LG, 'Optimus 3G' ],
+			'LG-E400!':									[ STRINGS_LG, 'Optimus L3' ],
+			'LG-E405!':									[ STRINGS_LG, 'Optimus L3 Dual' ],
+			'LG-E510!':									[ STRINGS_LG, 'Optimus Hub' ],
+			'LG-E6(10|12|17)!':							[ STRINGS_LG, 'Optimus L5' ],
+			'LG-E615!':									[ STRINGS_LG, 'Optimus L5 Dual' ],
+			'LG-E720!':									[ STRINGS_LG, 'Optimus Chic' ],
+			'LG-E730':									[ STRINGS_LG, 'Optimus Sol' ],
+			'LG-E960':									[ STRINGS_LG, 'Nexus 4' ],
+			'LG-E970':									[ STRINGS_LG, 'Shine' ],
+			'LG-F100!':									[ STRINGS_LG, 'Optimus Vu' ],
+			'LG-F120!':									[ STRINGS_LG, 'Optimus LTE Tag' ],
+			'LG-F160!':									[ STRINGS_LG, 'Optimus LTE II' ],
+			'LG-F180!':									[ STRINGS_LG, 'Optimus G' ],
+			'LG-GT540!':								[ STRINGS_LG, 'Optimus' ],
+			'LG-GW620':									[ STRINGS_LG, 'GW620 Eve' ],
+			'LG-KH5200':								[ STRINGS_LG, 'Andro-1' ],
+			'LG-KU3700':								[ STRINGS_LG, 'Optimus One' ],
+			'LG-KU5400':								[ STRINGS_LG, 'PRADA 3.0' ],
+			'LG-KU5900':								[ STRINGS_LG, 'Optimus Black' ],
+			'LG-L40G':									[ STRINGS_LG, 'L40G' ],
+			'LG-LG855':									[ STRINGS_LG, 'Marquee' ],
+			'LG-LS670':									[ STRINGS_LG, 'Optimus S' ],
+			'LG-LS696':									[ STRINGS_LG, 'Elite' ],
+			'LG-LS840':									[ STRINGS_LG, 'Viper' ],
+			'LG-LS855':									[ STRINGS_LG, 'Marquee' ],
+			'LG-LS860':									[ STRINGS_LG, '"Cayenne"' ],
+			'LG-LS970':									[ STRINGS_LG, 'Eclipse' ],
+			'LG-LU3000':								[ STRINGS_LG, 'Optimus Mach' ],
+			'LG-LU3100':								[ STRINGS_LG, 'Optimus Chic' ],
+			'LG-LU3700':								[ STRINGS_LG, 'Optimus One' ],
+			'LG-LU5400':								[ STRINGS_LG, 'PRADA 3.0' ],
+			'LG-LU6200':								[ STRINGS_LG, 'Optimus Q2' ],
+			'LG-LU6500':								[ STRINGS_LG, 'Optimus Note' ],
+			'LG-LU6800':								[ STRINGS_LG, 'Optimus Big' ],
+			'LG-LU8300':								[ STRINGS_LG, 'Optimus Pad LTE' ],
+			'LG-LW690':									[ STRINGS_LG, 'Optimus C' ],
+			'LG-LW770':									[ STRINGS_LG, 'Regard' ],
+			'LG-MS690':									[ STRINGS_LG, 'Optimus M' ],
+			'LG-MS770':									[ STRINGS_LG, 'Motion 4G' ],
+			'LG-MS840':									[ STRINGS_LG, 'Connect 4G' ],
+			'LG-MS870':									[ STRINGS_LG, 'MS870' ],
+			'LG-MS910':									[ STRINGS_LG, 'Esteem' ],
+			'LG-MS695':									[ STRINGS_LG, 'Optimus M+' ],
+			'LG-P350!':									[ STRINGS_LG, 'Optimus Me' ],
+			'LG-P355':									[ STRINGS_LG, 'P355' ],
+			'LG-P5(00|03|04)!':							[ STRINGS_LG, 'Optimus One' ],
+			'LG-P505!':									[ STRINGS_LG, 'Phoenix' ],
+			'LG-P506':									[ STRINGS_LG, 'Thrive' ],
+			'LG-P509':									[ STRINGS_LG, 'Optimus T' ],
+			'LG-P6(90|98)':								[ STRINGS_LG, 'Optimus Net' ],
+			'LG-P693':									[ STRINGS_LG, 'P693' ],
+			'LG-P7(00|05|08)!':							[ STRINGS_LG, 'Optimus L7' ],
+			'LG-P720!':									[ STRINGS_LG, 'Optimus Chic' ],
+			'LG-P725':									[ STRINGS_LG, 'Optimus 3D Max' ],
+			'LG-P7(60|69)!':							[ STRINGS_LG, 'Optimus L9' ],
+			'LG-P860':									[ STRINGS_LG, 'P860' ],
+			'LG-P870!':									[ STRINGS_LG, 'Escape' ],	
+			'LG-P880!':									[ STRINGS_LG, 'Optimus 4X HD' ],
+			'LG-P895':									[ STRINGS_LG, 'Optimus Vu' ],	
+			'LG-P920!':									[ STRINGS_LG, 'Optimus 3D' ],
+			'LG-P925!':									[ STRINGS_LG, 'Thrill' ],
+			'LG-P930':									[ STRINGS_LG, 'Nitro HD' ],
+			'LG-P936':									[ STRINGS_LG, 'Optimus LTE' ],
+			'LG-P940':									[ STRINGS_LG, 'PRADA 3.0' ],
+			'LG-P970!':									[ STRINGS_LG, 'Optimus Black' ],
+			'LG-P990!':									[ STRINGS_LG, 'Optimus 2X Speed' ],
+			'LG-P993':									[ STRINGS_LG, 'Optimus 2X' ],
+			'LG-SU540':									[ STRINGS_LG, 'PRADA 3.0' ],
+			'LG-SU640':									[ STRINGS_LG, 'Optimus LTE' ],
+			'LG-SU660':									[ STRINGS_LG, 'Optimus 2X' ],
+			'LG-SU760':									[ STRINGS_LG, 'Optimus 3D' ],
+			'LG-SU870':									[ STRINGS_LG, 'Optimus 3D Cube' ],
+			'LG-SU880':									[ STRINGS_LG, 'Optimus EX' ],
+			'LG-US670':									[ STRINGS_LG, 'Optimus U' ],
+			'LG-US730':									[ STRINGS_LG, 'Splendor' ],
+			'LG-V900':									[ STRINGS_LG, 'Optimus Pad', TYPE_TABLET ],
+			'LG-V9(05|09)!':							[ STRINGS_LG, 'Optimus G-Slate', TYPE_TABLET ],
+			'LG-VM670':									[ STRINGS_LG, 'Optimus V' ],
+			'LG-VM696':									[ STRINGS_LG, 'Optimus Elite' ],
+			'LG-VM701':									[ STRINGS_LG, 'Optimus Slider' ],
+			'LG-VS660':									[ STRINGS_LG, 'Vortex' ],
+			'LG-VS700':									[ STRINGS_LG, 'Enlighten' ],
+			'LG-VS740':									[ STRINGS_LG, 'Ally' ],
+			'LG-VS840':									[ STRINGS_LG, 'Lucid' ],
+			'LG-VS910':									[ STRINGS_LG, 'Revolution' ],
+			'lgp-970':									[ STRINGS_LG, 'Optimus Black' ],
+			'AS740':									[ STRINGS_LG, 'Axis' ],
+			'E900':										[ STRINGS_LG, 'Optimus 7' ],
+			'GT540':									[ STRINGS_LG, 'Optimus GT540' ],
+			'GW620':									[ STRINGS_LG, 'GW620' ],
+			'KU9500':									[ STRINGS_LG, 'Optimus Z' ],
+			'LGC660':									[ STRINGS_LG, 'Optimus Pro' ],
+			'LGL45C':									[ STRINGS_LG, 'Optimus Net' ],
+			'LGL55C':									[ STRINGS_LG, 'Optimus Q' ],
+			'LU2300':									[ STRINGS_LG, 'Optimus Q' ],	
+			'LS670':									[ STRINGS_LG, 'Optimus S' ],
+			'P940':										[ STRINGS_LG, 'PRADA 3.0' ],
+			'P990':										[ STRINGS_LG, 'Optimus 2X Speed' ],
+			'USCC-US730':								[ STRINGS_LG, 'Splendor' ],
+			'USCC-US760':								[ STRINGS_LG, 'Genesis' ],
+			'VM670':									[ STRINGS_LG, 'Optimus V' ],
+			'VS840 4G':									[ STRINGS_LG, 'Lucid' ],
+			'VS900-4G':									[ STRINGS_LG, 'Enlighten' ],
+			'VS910 4G':									[ STRINGS_LG, 'Revolution 4G' ],
+			'VS920 4G':									[ STRINGS_LG, 'Spectrum' ],
+			'VS930 4G':									[ STRINGS_LG, 'VS930' ],
+			'VS950 4G':									[ STRINGS_LG, 'Intuition' ],
+			'L-01D':									[ STRINGS_LG, 'Optimus LTE' ],
+			'L-02D':									[ STRINGS_LG, 'PRADA phone' ],
+			'L-02E':									[ STRINGS_LG, 'Optimus G' ],
+			'L-04C':									[ STRINGS_LG, 'Optimus Chat' ],
+			'L-05D':									[ STRINGS_LG, 'Optimus it' ],
+			'L-06C':									[ STRINGS_LG, 'Optimus Pad', TYPE_TABLET ],
+			'L-06D':									[ STRINGS_LG, 'Optimus Vu' ],
+			'L-07C':									[ STRINGS_LG, 'Optimus Bright' ],
+			'LG-Eve':									[ STRINGS_LG, 'Eve' ],
+			'LG-Optimus One P500':						[ STRINGS_LG, 'Optimus One' ],
+			'LG-Optimus 2X':							[ STRINGS_LG, 'Optimus 2X' ],
+			'LG-GT540 Optimus':							[ STRINGS_LG, 'Optimus' ],
+			'LG-Optimus Black':							[ STRINGS_LG, 'Optimus Black' ],
+			'Ally':										[ STRINGS_LG, 'Ally' ],
+			'Optimus':									[ STRINGS_LG, 'Optimus' ],
+			'Optimus Me':								[ STRINGS_LG, 'Optimus Me' ],
+			'optimus me p350':							[ STRINGS_LG, 'Optimus Me' ],
+			'Optimus 2X':								[ STRINGS_LG, 'Optimus 2X' ],
+			'Optimus 2x':								[ STRINGS_LG, 'Optimus 2X' ],
+			'IS11LG':									[ STRINGS_LG, 'Optimus X' ],
+			'Vortex':									[ STRINGS_LG, 'Vortex' ],
+			'LDK-ICK v1.4':								[ STRINGS_LG, 'Esteem' ],
+			'T6':										[ 'Malata', 'Zpad T6', TYPE_TABLET ],
+			'Malata SMBA1002':							[ 'Malata', 'Tablet SMB-A1002', TYPE_TABLET ],
+			'STM712HCZ':								[ 'Mediacom', 'SmartPad 712c', TYPE_TABLET ],
+			'STM803HC':									[ 'Mediacom', 'SmartPad 810c', TYPE_TABLET ],
+			'Mediacom 810C':							[ 'Mediacom', 'SmartPad 810c', TYPE_TABLET ],
+			'SmartPad810c':								[ 'Mediacom', 'SmartPad 810c', TYPE_TABLET ],
+			'MP810C':									[ 'Mediacom', 'SmartPad 810c', TYPE_TABLET ],
+			'MP907C':									[ 'Mediacom', 'SmartPad 907c', TYPE_TABLET ],
+			'MTK6516':									[ 'Mediatek', 'MTK6516' ],
+			'LIFETAB S9512':							[ 'Medion', 'Lifetab S9512', TYPE_TABLET ],
+			'LIFETAB P9514':							[ 'Medion', 'Lifetab P9514', TYPE_TABLET ],
+			'MD LIFETAB P9516':							[ 'Medion', 'Lifetab P9516', TYPE_TABLET ],
+			'MEDION LIFE P4310':						[ 'Medion', 'Life P4310' ],
+			'M8':										[ 'Meizu', 'M8' ],
+			'M9':										[ 'Meizu', 'M9' ],
+			'M9-unlocked':								[ 'Meizu', 'M9' ],
+			'MEIZU M9':									[ 'Meizu', 'M9' ],
+			'MEIZU MX':									[ 'Meizu', 'MX' ],
+			'M030':										[ 'Meizu', 'MX M030' ],
+			'M031':										[ 'Meizu', 'MX M031' ],
+			'M032':										[ 'Meizu', 'MX M032' ],
+			'Slidepad':									[ 'Memup', 'Slidepad', TYPE_TABLET ],
+			'A45':										[ 'Micromax', 'A45 Punk' ],
+			'Micromax A50':								[ 'Micromax', 'A50 Ninja' ],
+			'Micromax A57':								[ 'Micromax', 'A57 Ninja 3' ],
+			'Micromax A60':								[ 'Micromax', 'Andro A60' ],
+			'Micromax A70':								[ 'Micromax', 'Andro A70' ],
+			'Micromax A87':								[ 'Micromax', 'A87 Ninja 4' ],
+			'Micromax A90':								[ 'Micromax', 'A90 Superfone' ],
+			'P300(Funbook)':							[ 'Micromax', 'Funbook P300', TYPE_TABLET ],
+			'AT735':									[ 'Moinstone', 'AT735', TYPE_TABLET ],
+			'A853':										[ STRINGS_MOTOROLA, 'Milestone' ],
+			'A953':										[ STRINGS_MOTOROLA, 'Milestone 2' ],
+			'A1680':									[ STRINGS_MOTOROLA, 'MOTO A1680' ],
+			'ET1':										[ STRINGS_MOTOROLA, 'ET1 Enterprise Tablet', TYPE_TABLET ],
+			'MB200':									[ STRINGS_MOTOROLA, 'CLIQ' ],
+			'MB300':									[ STRINGS_MOTOROLA, 'BACKFLIP' ],
+			'MB501':									[ STRINGS_MOTOROLA, 'CLIQ XT' ],
+			'MB502':									[ STRINGS_MOTOROLA, 'CHARM' ],
+			'MB508':									[ STRINGS_MOTOROLA, 'FLIPSIDE' ],
+			'MB511':									[ STRINGS_MOTOROLA, 'FLIPOUT' ],
+			'MB520':									[ STRINGS_MOTOROLA, 'BRAVO' ],
+			'MB525!':									[ STRINGS_MOTOROLA, 'DEFY' ],
+			'MB526':									[ STRINGS_MOTOROLA, 'DEFY+' ],
+			'MB611':									[ STRINGS_MOTOROLA, 'CLIQ 2' ],
+			'MB612':									[ STRINGS_MOTOROLA, 'XPRT' ],
+			'MB632':									[ STRINGS_MOTOROLA, 'PRO+' ],
+			'MB855':									[ STRINGS_MOTOROLA, 'PHOTON 4G' ],
+			'MB860':									[ STRINGS_MOTOROLA, 'ATRIX' ],
+			'MB861':									[ STRINGS_MOTOROLA, 'ATRIX' ],
+			'MB865':									[ STRINGS_MOTOROLA, 'ATRIX 2' ],
+			'MB870':									[ STRINGS_MOTOROLA, 'Droid X2' ],
+			'MB886':									[ STRINGS_MOTOROLA, 'DINARA' ],
+			'ME501':									[ STRINGS_MOTOROLA, 'CLIQ XT' ],
+			'ME511':									[ STRINGS_MOTOROLA, 'FLIPOUT' ],
+			'ME525!':									[ STRINGS_MOTOROLA, 'MOTO ME525' ],
+			'ME600':									[ STRINGS_MOTOROLA, 'BACKFLIP' ],
+			'ME632':									[ STRINGS_MOTOROLA, 'PRO+' ],
+			'ME722':									[ STRINGS_MOTOROLA, 'Milestone 2' ],
+			'ME811':									[ STRINGS_MOTOROLA, 'Droid X' ],
+			'ME860':									[ STRINGS_MOTOROLA, 'ATRIX' ],
+			'ME863':									[ STRINGS_MOTOROLA, 'Milestone 3' ],
+			'ME865':									[ STRINGS_MOTOROLA, 'ATRIX 2' ],
+			'MT620!':									[ STRINGS_MOTOROLA, 'MOTO MT620' ],
+			'MT716':									[ STRINGS_MOTOROLA, 'MOTO MT716' ],
+			'MT810':									[ STRINGS_MOTOROLA, 'MOTO MT810' ],
+			'MT870':									[ STRINGS_MOTOROLA, 'MOTO MT870' ],
+			'MT917':									[ STRINGS_MOTOROLA, 'MT917' ],
+			'MZ505':									[ STRINGS_MOTOROLA, 'XOOM Family Edition', TYPE_TABLET ],
+			'MZ600':									[ STRINGS_MOTOROLA, 'XOOM 4G LTE', TYPE_TABLET ],
+			'MZ601':									[ STRINGS_MOTOROLA, 'XOOM 3G', TYPE_TABLET ],
+			'MZ602':									[ STRINGS_MOTOROLA, 'XOOM 4G LTE', TYPE_TABLET ],
+			'MZ603':									[ STRINGS_MOTOROLA, 'XOOM 3G', TYPE_TABLET ],
+			'MZ604':									[ STRINGS_MOTOROLA, 'XOOM WiFi', TYPE_TABLET ],
+			'MZ605':									[ STRINGS_MOTOROLA, 'XOOM 3G', TYPE_TABLET ],
+			'MZ606':									[ STRINGS_MOTOROLA, 'XOOM WiFi', TYPE_TABLET ],
+			'MZ607':									[ STRINGS_MOTOROLA, 'XOOM 2 WiFi Media Edition', TYPE_TABLET ],
+			'MZ609!':									[ STRINGS_MOTOROLA, 'Droid XYBOARD 8.2', TYPE_TABLET ],
+			'MZ615':									[ STRINGS_MOTOROLA, 'XOOM 2 WiFi', TYPE_TABLET ],
+			'MZ617!':									[ STRINGS_MOTOROLA, 'Droid XYBOARD 10.1', TYPE_TABLET ],
+			'WX435':									[ STRINGS_MOTOROLA, 'TRIUMPH WX435' ],
+			'WX445':									[ STRINGS_MOTOROLA, 'CITRUS WX445' ],
+			'XT300':									[ STRINGS_MOTOROLA, 'SPICE' ],
+			'XT301':									[ STRINGS_MOTOROLA, 'MOTO XT301' ],
+			'XT311':									[ STRINGS_MOTOROLA, 'FIRE' ],
+			'XT316':									[ STRINGS_MOTOROLA, 'MOTO XT316' ],
+			'XT319':									[ STRINGS_MOTOROLA, 'MOTO XT319' ],
+			'XT320':									[ STRINGS_MOTOROLA, 'DEFY Mini' ],
+			'XT321':									[ STRINGS_MOTOROLA, 'DEFY Mini' ],
+			'XT500':									[ STRINGS_MOTOROLA, 'MOTO XT500' ],
+			'xt-500':									[ STRINGS_MOTOROLA, 'MOTO XT500' ],
+			'XT502':									[ STRINGS_MOTOROLA, 'QUENCH XT5' ],
+			'XT530':									[ STRINGS_MOTOROLA, 'FIRE XT' ],
+			'XT531':									[ STRINGS_MOTOROLA, 'FIRE XT' ],
+			'XT532':									[ STRINGS_MOTOROLA, 'XT532' ],	
+			'XT535':									[ STRINGS_MOTOROLA, 'DEFY' ],	
+			'XT550':									[ STRINGS_MOTOROLA, 'XT550' ],	
+			'XT556':									[ STRINGS_MOTOROLA, 'XT556' ],	
+			'XT603':									[ STRINGS_MOTOROLA, 'ADMIRAL' ],
+			'XT605':									[ STRINGS_MOTOROLA, 'XT605' ],	
+			'XT610':									[ STRINGS_MOTOROLA, 'Droid Pro' ],
+			'XT615':									[ STRINGS_MOTOROLA, 'MOTO XT615' ],
+			'XT626':									[ STRINGS_MOTOROLA, 'MOTO XT626' ],
+			'XT681':									[ STRINGS_MOTOROLA, 'MOTO XT681' ],
+			'XT682':									[ STRINGS_MOTOROLA, 'Droid 3' ],
+			'XT685':									[ STRINGS_MOTOROLA, 'MOTO XT685' ],
+			'XT687':									[ STRINGS_MOTOROLA, 'ATRIX TV' ],
+			'XT701':									[ STRINGS_MOTOROLA, 'XT701' ],
+			'XT702':									[ STRINGS_MOTOROLA, 'MOTO XT702' ],
+			'XT711':									[ STRINGS_MOTOROLA, 'MOTO XT711' ],
+			'XT720':									[ STRINGS_MOTOROLA, 'Milestone' ],
+			'XT788':									[ STRINGS_MOTOROLA, 'XT788' ],
+			'XT875':									[ STRINGS_MOTOROLA, 'Droid Bionic' ],
+			'XT800W':									[ STRINGS_MOTOROLA, 'MOTO Glam' ],
+			'XT800!':									[ STRINGS_MOTOROLA, 'MOTO XT800' ],
+			'XT806':									[ STRINGS_MOTOROLA, 'MOTO XT806' ],
+			'XT860':									[ STRINGS_MOTOROLA, 'Milestone 3' ],
+			'XT862':									[ STRINGS_MOTOROLA, 'Droid 3' ],
+			'XT882':									[ STRINGS_MOTOROLA, 'MOTO XT882' ],
+			'XT883':									[ STRINGS_MOTOROLA, 'Milestone 3' ],
+			'XT885':									[ STRINGS_MOTOROLA, 'RAZR V' ],
+			'XT889':									[ STRINGS_MOTOROLA, 'XT889' ],
+			'XT890':									[ STRINGS_MOTOROLA, 'RAZR i' ],
+			'XT897':									[ STRINGS_MOTOROLA, 'Droid 4' ],
+			'XT901':									[ STRINGS_MOTOROLA, 'RAZR' ],
+			'XT907':									[ STRINGS_MOTOROLA, 'Droid RAZR Mini' ],
+			'XT910!':									[ STRINGS_MOTOROLA, 'RAZR' ],
+			'XT912':									[ STRINGS_MOTOROLA, 'Droid RAZR' ],
+			'XT923':									[ STRINGS_MOTOROLA, 'Droid RAZR HD' ],
+			'XT925':									[ STRINGS_MOTOROLA, 'Droid RAZR HD' ],
+			'XT926!':									[ STRINGS_MOTOROLA, 'Droid RAZR' ],
+			'XT928':									[ STRINGS_MOTOROLA, 'XT928' ],
+			'Atrix 2':									[ STRINGS_MOTOROLA, 'ATRIX 2' ],
+			'Atrix 4G':									[ STRINGS_MOTOROLA, 'ATRIX 4G' ],
+			'Atrix 4G ME860':							[ STRINGS_MOTOROLA, 'ATRIX 4G' ],
+			'CLIQ':										[ STRINGS_MOTOROLA, 'CLIQ' ],
+			'CLIQ XT':									[ STRINGS_MOTOROLA, 'CLIQ XT' ],
+			'CLIQ2':									[ STRINGS_MOTOROLA, 'CLIQ 2' ],
+			'Corvair':									[ STRINGS_MOTOROLA, 'Corvair', TYPE_TABLET ],
+			'DEFY':										[ STRINGS_MOTOROLA, 'DEFY' ],
+			'Defy(\\+| Plus)!':							[ STRINGS_MOTOROLA, 'DEFY+' ],
+			'Dext':										[ STRINGS_MOTOROLA, 'Dext' ],
+			'Droid':									[ STRINGS_MOTOROLA, 'Droid' ],
+			'DROID':									[ STRINGS_MOTOROLA, 'Droid' ],
+			'DROID ?2!':								[ STRINGS_MOTOROLA, 'Droid 2' ],
+			'DROID ?3!':								[ STRINGS_MOTOROLA, 'Droid 3' ],
+			'DROID ?4!':								[ STRINGS_MOTOROLA, 'Droid 4' ],
+			'DROID BIONIC!':							[ STRINGS_MOTOROLA, 'Droid Bionic' ],
+			'DROID RAZR HD!':							[ STRINGS_MOTOROLA, 'Droid RAZR HD' ],
+			'DROID ?RAZR!':								[ STRINGS_MOTOROLA, 'Droid RAZR' ],
+			'DROID SPYDER':								[ STRINGS_MOTOROLA, 'Droid RAZR' ],
+			'DROID ?X2!':								[ STRINGS_MOTOROLA, 'Droid X2' ],
+			'DROID ?X!':								[ STRINGS_MOTOROLA, 'Droid X' ],
+			'Devour':									[ STRINGS_MOTOROLA, 'Droid Devour' ],
+			'calgary':									[ STRINGS_MOTOROLA, 'Droid Devour' ],
+			'Electrify':								[ STRINGS_MOTOROLA, 'Electrify' ],
+			'Milestone XT720':							[ STRINGS_MOTOROLA, 'Milestone' ],
+			'Milestone':								[ STRINGS_MOTOROLA, 'Milestone' ],
+			'A853 Milestone':							[ STRINGS_MOTOROLA, 'Milestone' ],
+			'Milestone X':								[ STRINGS_MOTOROLA, 'Milestone X' ],
+			'Milestone X2':								[ STRINGS_MOTOROLA, 'Milestone X2' ],
+			'MotoroiX':									[ STRINGS_MOTOROLA, 'Droid X' ],
+			'Moto Backflip':							[ STRINGS_MOTOROLA, 'BACKFLIP' ],
+			'RAZR':										[ STRINGS_MOTOROLA, 'RAZR' ],
+			'Triumph':									[ STRINGS_MOTOROLA, 'TRIUMPH' ],
+			'Opus One':									[ STRINGS_MOTOROLA, 'i1' ],
+			'Photon':									[ STRINGS_MOTOROLA, 'PHOTON' ],
+			'Photon 4G':								[ STRINGS_MOTOROLA, 'PHOTON 4G' ],
+			'XOOM':										[ STRINGS_MOTOROLA, 'XOOM', TYPE_TABLET ],
+			'XOOM 2!':									[ STRINGS_MOTOROLA, 'XOOM 2', TYPE_TABLET ],
+			'XOOM MZ606':								[ STRINGS_MOTOROLA, 'XOOM WiFi', TYPE_TABLET ],
+			'ISW11M':									[ STRINGS_MOTOROLA, 'PHOTON' ],
+			'IS12M':									[ STRINGS_MOTOROLA, 'RAZR' ],
+			'MOTWX435KT':								[ STRINGS_MOTOROLA, 'TRIUMPH' ],
+			'X3-Ice MIUI XT720 Memorila Classics':		[ STRINGS_MOTOROLA, 'Milestone' ],
+			'NABI-A':									[ 'Nabi', 'Kids tablet', TYPE_TABLET ],
+			'Newpad':									[ 'Newsmy', 'Newpad', TYPE_TABLET ],
+			'Newpad-K97':								[ 'Newsmy', 'Newpad K97', TYPE_TABLET ],
+			'Newpad P9':								[ 'Newsmy', 'Newpad P9', TYPE_TABLET ],
+			'M-PAD N8':									[ 'Newsmy', 'M-pad N8', TYPE_TABLET ],
+			'LT-NA7':									[ 'NEC', 'LT-NA7' ],
+			'N-01D':									[ 'NEC', 'MEDIAS PP N-01D' ],
+			'N-04C':									[ 'NEC', 'MEDIAS N-04C' ],
+			'N-04D':									[ 'NEC', 'MEDIAS LTE N-04D' ],
+			'N-05D':									[ 'NEC', 'MEDIAS ES N-05D' ],
+			'N-06C':									[ 'NEC', 'MEDIAS WP N-06C' ],
+			'N-06D':									[ 'NEC', 'MEDIAS Tab N-06D', TYPE_TABLET ],
+			'N-07D':									[ 'NEC', 'MEDIAS X N-07D' ],
+			'101N':										[ 'NEC', 'MEDIAS CH Softbank 101N' ],
+			'IS11N':									[ 'NEC', 'MEDIAS BR IS11N' ],
+			'Nexian NX-A890':							[ 'Nexian', 'Journey' ],
+			'NX-A891':									[ 'Nexian', 'Ultra Journey' ],
+			'M726HC':									[ 'Nextbook', 'Premium 7', TYPE_EREADER ],
+			'Next7P12':									[ 'Nextbook', 'Premium 7', TYPE_EREADER ],
+			'NXM726HN':									[ 'Nextbook', 'Premium 7', TYPE_EREADER ],
+			'NXM727KC!':								[ 'Nextbook', 'Premium 7', TYPE_EREADER ],
+			'NXM803HD':									[ 'Nextbook', 'Premium 8', TYPE_EREADER ],
+			'DATAM803HC':								[ 'Nextbook', 'Premium 8', TYPE_EREADER ],
+			'NXM901':									[ 'Nextbook', 'Next 3', TYPE_EREADER],
+			'NGM Vanity Smart':							[ 'NGM', 'Vanity Smart' ],
+			'Nokia N9':									[ 'Nokia', 'N9' ],
+			'Nokia N900':								[ 'Nokia', 'N900' ],
+			'Lumia800':									[ 'Nokia', 'Lumia 800' ],
+			'Lumia 900':								[ 'Nokia', 'Lumia 900' ],
+			'Notion Ink ADAM':							[ 'Notion Ink', 'ADAM', TYPE_TABLET ],
+			'Adam':										[ 'Notion Ink', 'ADAM', TYPE_TABLET ],
+			'P4D Sirius':								[ 'Nvsbl', 'P4D SIRIUS', TYPE_TABLET ],
+			'EFM710A':									[ 'Oblio', 'Mint 7x', TYPE_TABLET ],
+			'ODYS-Xpress':								[ 'Odys', 'Xpress', TYPE_TABLET ],
+			'Olivetti Olipad 100':						[ 'Olivetti', 'Olipad 100', TYPE_TABLET ],
+			'OP110':									[ 'Olivetti', 'Olipad 110', TYPE_TABLET ],
+			'ONDA MID':									[ 'Onda', 'MID', TYPE_TABLET ],
+			'VX580A':									[ 'Onda', 'VX580A', TYPE_TABLET ],
+			'VX610A':									[ 'Onda', 'VX610A', TYPE_TABLET ],
+			'TQ150':									[ 'Onda', 'TQ150' ],
+			'N2T':										[ 'ONN', 'N2T', TYPE_TABLET ],
+			'Renesas!':									[ 'Opad', 'Renesas', TYPE_TABLET ],
+			'X903':										[ 'Oppo', 'Find Me X903' ],
+			'X905':										[ 'Oppo', 'Find 3 X905' ],
+			'OPPOX905':									[ 'Oppo', 'Find 3 X905' ],
+			'OPPOX907':									[ 'Oppo', 'Finder X907' ],
+			'X9015':									[ 'Oppo', 'Find X9015' ],
+			'OPPOX9017':								[ 'Oppo', 'Finder X9017' ],
+			'OPPOR801':									[ 'Oppo', 'Real R801' ],
+			'OPPOR805':									[ 'Oppo', 'Real R805' ],
+			'OPPOR807':									[ 'Oppo', 'Real R807' ],
+			'OPPOT29':									[ 'Oppo', 'T29' ],
+			'OPPOT703':									[ 'Oppo', 'T703' ],
+			'OPPOU7011':								[ 'Oppo', 'Find Gemini U7011' ],
+			'P-01D':									[ 'Panasonic', 'P-01D' ],
+			'P-02D':									[ 'Panasonic', 'Lumix Phone' ],
+			'P-04D':									[ 'Panasonic', 'Eluga' ],
+			'P-07C':									[ 'Panasonic', 'P-07C' ],
+			'dL1':										[ 'Panasonic', 'Eluga dL1' ],
+			'101P':										[ 'Panasonic', 'Lumix Phone' ],
+			'JT-H580VT':								[ 'Panasonic', 'BizPad 7', TYPE_TABLET ],
+			'JT-H581VT':								[ 'Panasonic', 'BizPad 10', TYPE_TABLET ],
+			'FZ-A1A':									[ 'Panasonic', 'Toughpad', TYPE_TABLET ],
+			'pandigital9hr':							[ 'Pandigital', '9HR', TYPE_TABLET ],
+			'pandigital9hr2':							[ 'Pandigital', '9HR2', TYPE_TABLET ],
+			'pandigitalopc1':							[ 'Pandigital', 'OPC1', TYPE_TABLET ],
+			'pandigitalopp1':							[ 'Pandigital', 'OPP1', TYPE_TABLET ],
+			'pandigitalp1hr':							[ 'Pandigital', 'p1hr', TYPE_TABLET ],
+			'IM-A600S':									[ STRINGS_PANTECH, 'SIRIUS α' ],
+			'IM-A630K':									[ STRINGS_PANTECH, 'SKY Izar' ],
+			'IM-A690!':									[ STRINGS_PANTECH, 'SKY' ],
+			'IM-A7(10|20)!':							[ STRINGS_PANTECH, 'SKY Vega Xpress' ],
+			'IM-A725L':									[ STRINGS_PANTECH, 'SKY Vega X+' ],
+			'IM-A730S':									[ STRINGS_PANTECH, 'SKY Vega S' ],
+			'IM-A750K':									[ STRINGS_PANTECH, 'SKY Mirach A' ],
+			'IM-A7(60|70|80)!':							[ STRINGS_PANTECH, 'SKY Vega Racer' ],
+			'IM-A800S':									[ STRINGS_PANTECH, 'SKY Vega LTE' ],
+			'IM-A810!':									[ STRINGS_PANTECH, 'SKY Vega LTE M' ],
+			'IM-A820L':									[ STRINGS_PANTECH, 'SKY Vega LTE EX' ],
+			'IM-A830!':									[ STRINGS_PANTECH, 'SKY Vega Racer 2' ],
+			'IM-A840S':									[ STRINGS_PANTECH, 'SKY Vega S5' ],
+			'IM-A850K':									[ STRINGS_PANTECH, 'IM-A850K' ],	
+			'IM-T100K':									[ STRINGS_PANTECH, 'SKY Vega No. 5', TYPE_TABLET ],
+			'IS06':										[ STRINGS_PANTECH, 'SIRIUS α' ],
+			'ADR8995!':									[ STRINGS_PANTECH, 'Breakout' ],
+			'ADR910L 4G':								[ STRINGS_PANTECH, 'ADR910L' ],
+			'PantechP4100':								[ STRINGS_PANTECH, 'Element', TYPE_TABLET ],
+			'PantechP8000':								[ STRINGS_PANTECH, 'Crossover' ],
+			'PantechP8010':								[ STRINGS_PANTECH, 'Flex' ],
+			'PantechP9060':								[ STRINGS_PANTECH, 'Pocket' ],
+			'PantechP9070':								[ STRINGS_PANTECH, 'Burst' ],
+			'PantechP9090':								[ STRINGS_PANTECH, 'Magnus' ],
+			'SKY IM-A600S':								[ STRINGS_PANTECH, 'SIRIUS α' ],
+			'SKY IM-A630K':								[ STRINGS_PANTECH, 'SKY Izar' ],
+			'SKY IM-A650S':								[ STRINGS_PANTECH, 'SKY Vega' ],
+			'IS11PT':									[ STRINGS_PANTECH, 'Mirach IS11PT' ],
+			'PAT712W':									[ 'Perfeo', 'PAT712W', TYPE_TABLET ],
+			'X7G':										[ 'Pearl', 'Touchlet X7G', TYPE_TABLET ],
+			'FWS810':									[ 'PHICOMM', 'FWS810' ],
+			'Philips PI5000':							[ 'Philips', 'PI5000', TYPE_TABLET ],
+			'PI7000':									[ 'Philips', 'PI7000', TYPE_TABLET ],
+			'Philips W626':								[ 'Philips', 'W626' ],
+			'Philips W632':								[ 'Philips', 'W632' ],
+			'MOMO':										[ 'Ployer', 'MOMO', TYPE_TABLET ],
+			'MOMO8':									[ 'Ployer', 'MOMO8', TYPE_TABLET ],
+			'MOMO15':									[ 'Ployer', 'MOMO15', TYPE_TABLET ],
+			'PocketBook A7':							[ 'PocketBook', 'A7', TYPE_TABLET ],
+			'PocketBook A10':							[ 'PocketBook', 'A10', TYPE_TABLET ],
+			'Mobii 7':									[ 'Point Of View', 'Mobii 7', TYPE_TABLET ],
+			'PMP3384BRU':								[ 'Prestigio', 'Multipad 3384', TYPE_TABLET ],
+			'TB07FTA':									[ 'Positivo', 'TB07FTA', TYPE_TABLET ],
+			'QW TB-1207':								[ 'Qware', 'Pro3', TYPE_TABLET ],
+			'W6HD ICS':									[ 'Ramos', 'W6HD', TYPE_TABLET ],
+			'W10':										[ 'Ramos', 'W10', TYPE_TABLET ],
+			'W10 V2.0':									[ 'Ramos', 'W10 v2.0', TYPE_TABLET ],
+			'T11AD!':									[ 'Ramos', 'T11AD', TYPE_TABLET ],
+			'Rikomagic MK802':							[ 'Rikomagic', 'MK802', TYPE_TELEVISION ],
+			'PlayBook':									[ 'RIM', 'BlackBerry PlayBook', TYPE_TABLET ],
+			'RBK-490':									[ 'Ritmix', 'RBK-490', TYPE_TABLET ],
+			'A8HD':										[ 'Saayi', 'Dropad A8HD', TYPE_TABLET ],
+			'Galaxy Nexus':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
+			'GT-B5330!':								[ STRINGS_SAMSUNG, 'GT-B5330' ],
+			'GT-B5510!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y Pro' ],
+			'GT-B5512!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y Pro Duos' ],
+			'GT-B7510!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Pro' ],
+			'GT-I55(00|03|08)!':						[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' 5' ],
+			'GT-I5510!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' 551' ],
+			'GT-I5700!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Spica' ],
+			'GT-I58(00|01)!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Apollo' ],
+			'GT-I6500!':								[ STRINGS_SAMSUNG, 'Saturn' ],
+			'GT-I777!':									[ STRINGS_SAMSUNG, 'Singa' ],
+			'GT-I8000!':								[ STRINGS_SAMSUNG, 'Omnia 2' ],
+			'GT-I8150!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' W' ],
+			'GT-I8160!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace 2' ],
+			'GT-I8190!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III Mini' ],
+			'GT-I8250!':								[ STRINGS_SAMSUNG, 'GT-I8250' ],
+			'GT-I8320!':								[ STRINGS_SAMSUNG, 'H1' ],
+			'GT-I85(20|30)!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Beam' ],
+			'GT-I90(00|08|88)!':						[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
+			'GT-I9001!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Plus' ],
+			'GT-I9003!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' SL' ],
+			'GT-I9010!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Giorgio Armani' ],
+			'GT-I9018!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' GT-I9018' ],
+			'GT-I9050!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' GT-I9050' ],
+			'GT-I9070!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Advance' ],
+			'GT-I91(00|08)!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
+			'GT-I9103!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' R' ],
+			'GT-I9210!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II LTE' ],
+			'GT-I92(20|28)!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
+			'GT-I9250!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
+			'GT-I93(00|03|05|08)!':						[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
+			'GT-I9500!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' GT-I9500' ],
+			'GT-I9800!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' GT-I9800' ],
+			'GT-N7000!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
+			'GT-N71(00|05)!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note II' ],
+			'GT-N80(00|05|10|13)!':						[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note 10.1' ],
+			'GT-P10(00|10)!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', TYPE_TABLET ],
+			'GT-P31(00|10|13)!':						[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 2 (7.0)', TYPE_TABLET ],
+			'GT-P51(00|10|13)!':						[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 2 (10.1)', TYPE_TABLET ],
+			'GT-P62(00|10)!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.0 Plus', TYPE_TABLET ],
+			'GT-P62(01|11)!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.0 Plus N', TYPE_TABLET ],
+			'GT-P68(00|10)!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.7', TYPE_TABLET ],
+			'GT-P7100!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1V', TYPE_TABLET ],
+			'GT-P73(00|10|20)!':						[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 8.9', TYPE_TABLET ],
+			'GT-P75(00|10)!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1', TYPE_TABLET ],
+			'GT-P75(01|11)!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1N', TYPE_TABLET ],
+			'GT-S5300!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Pocket' ],
+			'GT-S5302!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Pocket Duos' ],
+			'GT-S53(60|63|69)!':						[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y' ],
+			'GT-S5367!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y TV' ],
+			'GT-S5368!':								[ STRINGS_SAMSUNG, 'GT-S5368' ],
+			'GT-S55(70|78)!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Mini' ],
+			'GT-S5660!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Gio' ],
+			'GT-S5670!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Fit' ],
+			'GT-S5690!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Xcover' ],
+			'GT-S58(20|30|38|39)!':						[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace' ],
+			'GT-S6102!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y Duos' ],
+			'GT-S6500!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Mini 2' ],
+			'GT-S6702!':								[ STRINGS_SAMSUNG, 'GT-S6702' ],
+			'GT-S6802!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace Duos' ],
+			'GT-S7500!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace Plus' ],
+			'GT-S7562!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Duos' ],
+			'GT-T959!':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Vibrant' ],
+			'SCH-i509':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y' ],
+			'SCH-i559':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Pop' ],
+			'SCH-i569':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Gio' ],
+			'SCH-i579':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace' ],
+			'SCH-i589':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace Duos' ],
+			'SCH-i705 4G':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 2 (7.0)', TYPE_TABLET ],
+			'SCH-i809':									[ STRINGS_SAMSUNG, 'SCH-i809' ],
+			'SCH-i889':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
+			'SCH-i909':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
+			'SCH-i919':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Duos' ],
+			'SCH-i929':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II Duos' ],
+			'SCH-I100':									[ STRINGS_SAMSUNG, 'Gem' ],
+			'SCH-I110':									[ STRINGS_SAMSUNG, 'Illusion' ],
+			'SCH-I200':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Stellar' ],
+			'SCH-I400':									[ STRINGS_SAMSUNG, 'Continuum' ],
+			'SCH-I405( 4G)?$!':							[ STRINGS_SAMSUNG, 'Stratosphere' ],
+			'SCH-I405U':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Metrix' ],
+			'SCH-I500':									[ STRINGS_SAMSUNG, 'Fascinate' ],
+			'SCH-I510':									[ STRINGS_SAMSUNG, 'Stealth V' ],
+			'SCH-I510 4G':								[ STRINGS_SAMSUNG, 'Droid Charge' ],
+			'SCH-I515':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
+			'SCH-I535!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
+			'SCH-I605':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note II' ],
+			'SCH-I619':									[ STRINGS_SAMSUNG, 'SCH-I619' ],
+			'SCH-I779':									[ STRINGS_SAMSUNG, 'SCH-I779' ],
+			'SCH-I800':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.0', TYPE_TABLET ],
+			'SCH-I815!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.7', TYPE_TABLET ],
+			'SCH-I905!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1', TYPE_TABLET ],
+			'SCH-I909':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
+			'SCH-I915':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 2 (10.1)', TYPE_TABLET ],
+			'SCH-I939':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
+			'SCH-M828!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Precedent' ],
+			'SCH-R530!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
+			'SCH-R680':									[ STRINGS_SAMSUNG, 'Repp' ],
+			'SCH-R720':									[ STRINGS_SAMSUNG, 'Admire' ],
+			'SCH-R730':									[ STRINGS_SAMSUNG, 'Transfix' ],
+			'SCH-R760':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
+			'SCH-R820':									[ STRINGS_SAMSUNG, 'Admire' ],
+			'SCH-R880':									[ STRINGS_SAMSUNG, 'Acclaim' ],
+			'SCH-R910':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Indulge 4G' ],
+			'SCH-R915':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Indulge' ],
+			'SCH-R920':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Attain 4G' ],
+			'SCH-R930':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Aviator' ],
+			'SCH-R940':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Lightray' ],
+			'SCH-S720C':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Proclaim' ],
+			'SCH-S735C':								[ STRINGS_SAMSUNG, 'SCH-S735' ],
+			'SCH-W899':									[ STRINGS_SAMSUNG, 'SCH-W899' ],
+			'SCH-W999':									[ STRINGS_SAMSUNG, 'SCH-W999' ],
+			'SGH-E258':									[ STRINGS_SAMSUNG, 'SGH-E258' ],
+			'SGH-I317M':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note II' ],
+			'SGH-I547':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Rugby Pro' ],
+			'SGH-I717!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
+			'SGH-I727':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II Skyrocket' ],
+			'SGH-I727R':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
+			'SGH-I7(47|48)!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
+			'SGH-I757!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II Skyrocket HD' ],
+			'SGH-I9?777!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
+			'SGH-I8(96|97)!':							[ STRINGS_SAMSUNG, 'Captivate' ],
+			'SGH-I927!':								[ STRINGS_SAMSUNG, 'Captivate Glide' ],
+			'SGH-I957!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 8.9', TYPE_TABLET ],
+			'SGH-I987':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.0', TYPE_TABLET ],
+			'SGH-I997':									[ STRINGS_SAMSUNG, 'Infuse 4G' ],
+			'SGH-I997R':								[ STRINGS_SAMSUNG, 'Infuse 4G' ],
+			'SGH-I9000':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
+			'SGH-S730G':								[ STRINGS_SAMSUNG, 'SGH-S730' ],
+			'SGH-T499':									[ STRINGS_SAMSUNG, 'Dart' ],
+			'SGH-T499[VY]!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Mini' ],
+			'SGH-T589!':								[ STRINGS_SAMSUNG, 'Gravity Smart' ],
+			'SGH-T679!':								[ STRINGS_SAMSUNG, 'Exhibit II 4G' ],
+			'SGH-T759':									[ STRINGS_SAMSUNG, 'Exhibit 4G' ],
+			'SGH-T769':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Blaze 4G' ],
+			'SGH-T839':									[ STRINGS_SAMSUNG, 'T-Mobile Sidekick' ],
+			'SGH-T849':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.0', TYPE_TABLET ],
+			'SGH-T859':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1', TYPE_TABLET ],
+			'SGH-T869':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.0 Plus', TYPE_TABLET ],
+			'SGH-T879':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
+			'SGH-T959':									[ STRINGS_SAMSUNG, 'Vibrant' ],
+			'SGH-T959D':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Fascinate 3G+' ],
+			'SGH-T959P':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Fascinate 4G' ],
+			'SGH-T959V':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S 4G' ],
+			'SGH-T989':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
+			'SGH-T989D':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II X' ],
+			'SGH-T999!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Blaze 4G' ],
+			'SHV-E120!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II HD LTE' ],
+			'SHV-E110!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II LTE' ],
+			'SHV-E140!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 8.9', TYPE_TABLET ],
+			'SHV-E150!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.7', TYPE_TABLET ],
+			'SHV-E160!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
+			'SHV-E170!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' R' ],
+			'SHV-E210!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
+			'SHV-E250!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note II' ],
+			'SHW-M100!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' A' ],
+			'SHW-M110!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
+			'SHW-M130L!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' U' ],
+			'SHW-M130K!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' K' ],
+			'SHW-M1(80|85)!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', TYPE_TABLET ],
+			'SHW-M190!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Hoppin' ],
+			'SHW-M220!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Neo' ],
+			'SHW-M240!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace' ],
+			'SHW ?-M250!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
+			'SHW-M300!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1', TYPE_TABLET ],
+			'SHW-M305!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 8.9', TYPE_TABLET ],
+			'SHW-M340!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' M Style' ],
+			'SHW-M380!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1', TYPE_TABLET ],
+			'SHW-M440!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
+			'SHW-M480!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note 10.1' ],
+			'SMT-i9100':								[ STRINGS_SAMSUNG, 'SMT-I9100', TYPE_TABLET ],
+			'SPH-D600':									[ STRINGS_SAMSUNG, 'Conquer 4G' ],
+			'SPH-D700':									[ STRINGS_SAMSUNG, 'Epic 4G' ],
+			'SPH-D705':									[ STRINGS_SAMSUNG, 'Epic 4G 2' ],
+			'SPH-D710!':								[ STRINGS_SAMSUNG, 'Epic 4G Touch' ],
+			'SPH-L700':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
+			'SPH-L710':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
+			'SPH-M820!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Prevail' ],
+			'SPH-M580':									[ STRINGS_SAMSUNG, 'Replenish' ],
+			'SPH-M900':									[ STRINGS_SAMSUNG, 'Moment' ],
+			'SPH-M910':									[ STRINGS_SAMSUNG, 'Intercept' ],
+			'SPH-M920':									[ STRINGS_SAMSUNG, 'Transform' ],
+			'SPH-M930!':								[ STRINGS_SAMSUNG, 'Transform Ultra' ],
+			'SPH-P100':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', TYPE_TABLET ],
+			'YP-GB1':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Player', 'media' ],
+			'YP-GB70':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Player 70', 'media' ],
+			'YP-GB70D':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Player 70 Plus', 'media' ],
+			'YP-GS1':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S WiFi 3.6', 'media' ],
+			'YP-G1':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S WiFi 4.0', 'media' ],
+			'YP-GI1':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S WiFi 4.2', 'media' ],
+			'YP-G50':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Player', 'media' ],
+			'YP-G70':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S WiFi 5.0', 'media' ],
+			'GT9100':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
+			'I897':										[ STRINGS_SAMSUNG, 'Captivate' ],
+			'I7500':									[ STRINGS_SAMSUNG, 'Galaxy' ],
+			'I9000':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
+			'T959':										[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Vibrant' ],
+			'Captivate-I897':							[ STRINGS_SAMSUNG, 'Captivate' ],
+			'Galaxy':									[ STRINGS_SAMSUNG, STRINGS_GALAXY ],
+			'Galaxy Note':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
+			'GalaxyS':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
+			'Galaxy S II':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
+			'Galaxy X':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' X' ],
+			'Galaxy Spica':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Spica' ],
+			'GALAXY Tab':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', TYPE_TABLET ],
+			'GALAXY NEXUS':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
+			'Vibrantmtd':								[ STRINGS_SAMSUNG, 'Vibrant' ],
+			'SC-01C':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', TYPE_TABLET ],
+			'SC-01D':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1 LTE', TYPE_TABLET ],
+			'SC-01E':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.7 Plus', TYPE_TABLET ],
+			'SC-02B':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
+			'SC-02C':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
+			'SC-02D':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.0 Plus', TYPE_TABLET ],
+			'SC-02E':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note II' ],
+			'SC-03D':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II LTE' ],
+			'SC-04D':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
+			'SC-05D':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note LTE' ],
+			'SC-06D':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
+			'ISW11SC':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II WiMAX' ],
+			'A01SH':									[ STRINGS_SHARP, 'A01SH' ],
+			'IS01':										[ STRINGS_SHARP, 'IS01' ],
+			'IS03':										[ STRINGS_SHARP, 'IS03' ],
+			'IS05':										[ STRINGS_SHARP, 'IS05' ],
+			'IS11SH':									[ STRINGS_SHARP, 'Aquos IS11SH' ],
+			'IS12SH':									[ STRINGS_SHARP, 'Aquos IS12SH' ],
+			'IS13SH':									[ STRINGS_SHARP, 'Aquos IS13SH' ],
+			'IS14SH':									[ STRINGS_SHARP, 'Aquos IS14SH' ],
+			'ISW16SH':									[ STRINGS_SHARP, 'Aquos ISW16SH' ],
+			'EB-W51GJ':									[ STRINGS_SHARP, 'EB-W51GJ' ],
+			'SBM003SH':									[ STRINGS_SHARP, 'Galapagos' ],
+			'SBM005SH':									[ STRINGS_SHARP, 'Galapagos' ],
+			'SBM006SH':									[ STRINGS_SHARP, 'Aquos' ],
+			'SBM007SH':									[ STRINGS_SHARP, 'Aquos 007SH' ],
+			'SBM009SH':									[ STRINGS_SHARP, 'Aquos 009SH' ],
+			'SBM102SH':									[ STRINGS_SHARP, 'Aquos 102SH' ],
+			'SBM103SH':									[ STRINGS_SHARP, 'Aquos 103SH' ],
+			'SBM104SH':									[ STRINGS_SHARP, 'Aquos 104SH' ],
+			'SBM107SH':									[ STRINGS_SHARP, 'Aquos 107SH' ],
+			'SBM107SHB':								[ STRINGS_SHARP, 'Aquos 107SH' ],
+			'SH-01D':									[ STRINGS_SHARP, 'Aquos SH-01D' ],
+			'SH-01E':									[ STRINGS_SHARP, 'Aquos si SH-01E' ],
+			'SH-02D':									[ STRINGS_SHARP, 'Aquos slider SH-02D' ],
+			'SH-02E':									[ STRINGS_SHARP, 'Aquos Zeta SH-02E' ],
+			'SH-03C':									[ STRINGS_SHARP, 'Lynx 3D' ],
+			'SH-06D':									[ STRINGS_SHARP, 'Aquos SH-06D' ],
+			'SH-09D':									[ STRINGS_SHARP, 'Aquos Zeta SH-09D' ],
+			'SH-10B':									[ STRINGS_SHARP, 'Lynx' ],
+			'SH-12C':									[ STRINGS_SHARP, 'Aquos' ],
+			'SH-13C':									[ STRINGS_SHARP, 'Aquos f SH-13C' ],
+			'SH80F':									[ STRINGS_SHARP, 'Aquos SH80F' ],
+			'SH530U':									[ STRINGS_SHARP, 'SH530U' ],
+			'SH72x8U':									[ STRINGS_SHARP, 'SH72x8U' ],
+			'SH8118U':									[ STRINGS_SHARP, 'SH8118U' ],
+			'SH8128U':									[ STRINGS_SHARP, 'SH8128U' ],
+			'SH8158U':									[ STRINGS_SHARP, 'SH8158U' ],
+			'SH8188U':									[ STRINGS_SHARP, 'SH8188U' ],
+			'SH8268U':									[ STRINGS_SHARP, 'SH8268U' ],
+			'INFOBAR C01':								[ STRINGS_SHARP, 'INFOBAR C01' ],
+			'SPX-5':									[ 'Simvalley', 'SPX-5' ],
+			'SPX-5 3G':									[ 'Simvalley', 'SPX-5 3G' ],
+			'SmartQ G7':								[ 'SmartQ', 'G7', TYPE_TABLET ],
+			'SmartQT7':									[ 'SmartQ', 'T7', TYPE_TABLET ],
+			'SmartQT10':								[ 'SmartQ', 'T10', TYPE_TABLET ],
+			'SmartQT15':								[ 'SmartQ', 'T15', TYPE_TABLET ],
+			'SmartQT19':								[ 'SmartQ', 'T19', TYPE_TABLET ],
+			'SmartQT20':								[ 'SmartQ', 'T20', TYPE_TABLET ],
+			'OMS1 6':									[ STRINGS_SONY_ERICSSON, 'A8i' ],
+			'C65(02|03|06)!':							[ STRINGS_SONY, STRINGS_XPERIA + ' "Odin"' ],
+			'E10(a|i|iv)!':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10 Mini' ],
+			'E15(a|i|iv|i-o)?$!':						[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X8' ],
+			'E16i!':									[ STRINGS_SONY_ERICSSON, 'W8 Walkman' ],
+			'LT11i!':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo V' ],
+			'LT15(a|i|iv|i-o)?$!':						[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc' ],
+			'LT18(a|i|iv|i-o)?$!':						[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc S' ],
+			'LT22i!':									[ STRINGS_SONY, STRINGS_XPERIA + ' P' ],
+			'LT26(i|i-o)!':								[ STRINGS_SONY, STRINGS_XPERIA + ' S' ],
+			'LT26ii!':									[ STRINGS_SONY, STRINGS_XPERIA + ' SL' ],
+			'LT26w!':									[ STRINGS_SONY, STRINGS_XPERIA + ' Acro S' ],
+			'LT28(at|h|i)!':							[ STRINGS_SONY, STRINGS_XPERIA + ' Ion' ],
+			'LT29i!':									[ STRINGS_SONY, STRINGS_XPERIA + ' GX' ],
+			'LT30(a|p)!':								[ STRINGS_SONY, STRINGS_XPERIA + ' T' ],
+			'MK16(a|i)!':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Pro' ],
+			'MT11(a|i|iv|i-o)!':						[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo V' ],
+			'MT15(a|i|iv|i-o)!':						[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo' ],
+			'MT25i!':									[ STRINGS_SONY, STRINGS_XPERIA + ' Neo L' ],
+			'MT27i!':									[ STRINGS_SONY, STRINGS_XPERIA + ' Sola' ],
+			'R800(a|at|i|iv|x)!':						[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Play' ],
+			'SK17(a|i|iv|i-o)!':						[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Mini Pro' ],
+			'ST15(a|i)!':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Mini' ],
+			'ST17(a|i)!':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Active' ],
+			'ST18(a|av|i|iv)!':							[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Ray' ],
+			'ST21(i)?$!':								[ STRINGS_SONY, STRINGS_XPERIA + ' Tipo' ],
+			'ST21(a2|i2)!':								[ STRINGS_SONY, STRINGS_XPERIA + ' Tipo Dual' ],
+			'ST23i!':									[ STRINGS_SONY, STRINGS_XPERIA + ' Miro' ],
+			'ST25(a|i)!':								[ STRINGS_SONY, STRINGS_XPERIA + ' U' ],
+			'ST26i!':									[ STRINGS_SONY, STRINGS_XPERIA + ' J' ],
+			'ST27i!':									[ STRINGS_SONY, STRINGS_XPERIA + ' Go' ],
+			'U20(a|i|iv)!':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10 Mini Pro' ],
+			'WT13i!':									[ STRINGS_SONY_ERICSSON, 'Mix Walkman' ],
+			'WT18i!':									[ STRINGS_SONY_ERICSSON, 'Walkman' ],
+			'WT19(a|i|iv)!':							[ STRINGS_SONY_ERICSSON, 'Live with Walkman' ],
+			'X8':										[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X8' ],
+			'X10(a|i|iv|s)?$!':							[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10' ],
+			'X10 ?(Mini|Mini Pro)$!':					[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10 Mini Pro' ],
+			'Z1i':										[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Play' ],
+			'S51SE':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Mini' ],
+			'IS11S':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Acro' ],
+			'IS12S':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Acro HD' ],
+			'SO-01B':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10' ],
+			'SO-01C':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc' ],
+			'SO-01D':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Play' ],
+			'SO-02C':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Acro' ],
+			'SO-02D':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' NX' ],
+			'SO-03C':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Ray' ],
+			'SO-03D':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Acro HD' ],
+			'SO-04D':									[ STRINGS_SONY, STRINGS_XPERIA + ' GX' ],
+			'SO-05D':									[ STRINGS_SONY, STRINGS_XPERIA + ' SX' ],
+			'Xperia X1':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X1' ],
+			'Xperia X8':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X8' ],
+			'Xperia X10':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10' ],
+			'Xperia Ray':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Ray' ],
+			'Xperia Arc':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc' ],
+			'Xperia Arc S':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc S' ],
+			'Xperia Mini':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Mini' ],
+			'Xperia Neo':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo' ],
+			'Xperia NeoV':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo V' ],
+			'Xperia Neo V':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo V' ],
+			'Xperia Play':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Play' ],
+			'Xperia Pro':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Pro' ],
+			'Xperia Live with Walkman':					[ STRINGS_SONY_ERICSSON, 'Live with Walkman' ],
+			'Hayabusa':									[ STRINGS_SONY, STRINGS_XPERIA + ' Ion' ],
+			'Nozomi':									[ STRINGS_SONY, STRINGS_XPERIA + ' S' ],
+			'Tablet P':									[ STRINGS_SONY, 'Tablet P', TYPE_TABLET ],
+			'Tablet S':									[ STRINGS_SONY, 'Tablet S', TYPE_TABLET ],
+			'NWZ?-Z1000Series!':						[ STRINGS_SONY, 'Walkman Z', 'media' ],
+			'Spice Mi280':								[ 'Spice', 'Mi-280' ],
+			'Spice Mi300':								[ 'Spice', 'Mi-300' ],
+			'Spice Mi-310':								[ 'Spice', 'Mi-310' ],
+			'Spice Mi-355':								[ 'Spice', 'Mi-355' ],
+			'Spice Mi-425':								[ 'Spice', 'Mi-425' ],
+			'SPICE Mi-720':								[ 'Spice', 'Mi-720' ],
+			'A7272+':									[ 'Star', 'A7272+' ],
+			'e1109 v73 gq1002 ctp':						[ 'Star', 'X18i' ],
+			'TS1004T':									[ 'Surf 3Q', 'TS1004T', TYPE_TABLET ],
+			'SYTABEX7-2':								[ 'Sylvania', 'SYTABEX7', TYPE_TABLET ],
+			'KM-S200':									[ 'TAKE', 'Janus KM-S200' ],
+			'TCL A860':									[ 'TCL' , 'A860' ],
+			'TCL A906':									[ 'TCL' , 'A906' ],
+			'TCL A909':									[ 'TCL' , 'A909' ],
+			'TCL A919':									[ 'TCL' , 'A919' ],
+			'TCL A990':									[ 'TCL' , 'A990' ],
+			'TCL A996':									[ 'TCL' , 'A996' ],
+			'TCL A998':									[ 'TCL' , 'A998' ],
+			'TCL GENESEE E708':							[ 'TCL' , 'Genesee E708' ],
+			'A10t(5DM3)':								[ 'Teclast', 'A10T', TYPE_TABLET ],
+			'P72':										[ 'Teclast', 'P72', TYPE_TABLET ],
+			'P76TI':									[ 'Teclast', 'P76Ti', TYPE_TABLET ],
+			'P81HD':									[ 'Teclast', 'P81HD', TYPE_TABLET ],
+			'P85(R8A1)':								[ 'Teclast', 'P85', TYPE_TABLET ],
+			'Teclast P85':								[ 'Teclast', 'P85', TYPE_TABLET ],
+			'T720 SE':									[ 'Teclast', 'T720', TYPE_TABLET ],
+			'T760 from moage.com':						[ 'Teclast', 'T760', TYPE_TABLET ],
+			'tegav2':									[ 'Tegatech', 'TEGA v2', TYPE_TABLET ],
+			'TM-7025':									[ 'teXet', 'TM-7025', TYPE_TABLET ],
+			'MoFing':									[ 'Thomson', 'MoFing', TYPE_TABLET ],
+			'Ultimate10':								[ 'Tomtec', 'Ultimate10', TYPE_TABLET ],
+			'ThL V7':									[ 'THL', 'V7' ],
+			'ThL V8':									[ 'THL', 'V8' ],
+			'ThL V9':									[ 'THL', 'V9' ],
+			'ThL V11':									[ 'THL', 'V11' ],
+			'TSB CLOUD COMPANION;TOSHIBA AC AND AZ':	[ STRINGS_TOSHIBA, 'Dynabook AZ', 'desktop' ],
+			'TOSHIBA AC AND AZ':						[ STRINGS_TOSHIBA, 'Dynabook AZ', 'desktop' ],
+			'TOSHIBA FOLIO AND A':						[ STRINGS_TOSHIBA, 'Folio 100', TYPE_TABLET ],
+			'T-01C':									[ STRINGS_TOSHIBA, 'Regza T-01C' ],
+			'T-01D':									[ STRINGS_TOSHIBA, 'Regza T-01D' ],
+			'T-02D':									[ STRINGS_TOSHIBA, 'Regza T-02D' ],
+			'IS04':										[ STRINGS_TOSHIBA, 'Regza IS04' ],
+			'IS11T':									[ STRINGS_TOSHIBA, 'Regza IS11T' ],
+			'AT1S0':									[ STRINGS_TOSHIBA, 'Regza AT1S0' ],
+			'Tostab03':									[ STRINGS_TOSHIBA, 'Regza AT100', TYPE_TABLET ],
+			'AT100':									[ STRINGS_TOSHIBA, 'Regza AT100', TYPE_TABLET ],
+			'AT200':									[ STRINGS_TOSHIBA, 'Regza AT200', TYPE_TABLET ],
+			'AT300':									[ STRINGS_TOSHIBA, 'Regza AT300', TYPE_TABLET ],
+			'AT470':									[ STRINGS_TOSHIBA, 'Regza AT470', TYPE_TABLET ],
+			'AT570':									[ STRINGS_TOSHIBA, 'Regza AT570', TYPE_TABLET ],
+			'AT830':									[ STRINGS_TOSHIBA, 'Regza AT830', TYPE_TABLET ],
+			'Folio 100':								[ STRINGS_TOSHIBA, 'Folio 100', TYPE_TABLET ],
+			'folio100':									[ STRINGS_TOSHIBA, 'Folio 100', TYPE_TABLET ],
+			'THRiVE':									[ STRINGS_TOSHIBA, 'THRiVE', TYPE_TABLET ],
+			'Fantastic T3':								[ 'TWM', 'Fantastic T3' ],
+			'M70014':									[ 'United Star Technology', 'M70014', TYPE_TABLET ],
+			'PS47':										[ 'Velocity Micro', 'Cruz PS47', TYPE_TABLET ],
+			'T301':										[ 'Velocity Micro', 'Cruz T301', TYPE_TABLET ],
+			'Vibo-A688':								[ 'FIH', 'Vibo A688' ],
+			'Videocon-V7500':							[ 'Videocon', 'V7500' ],
+			'GTablet':									[ 'ViewSonic', 'gTablet', TYPE_TABLET ],
+			'GtabComb':									[ 'ViewSonic', 'gTablet', TYPE_TABLET ],
+			'TeamDRH ICS for GTablet':					[ 'ViewSonic', 'gTablet', TYPE_TABLET ],
+			'ViewPad7':									[ 'ViewSonic', 'ViewPad 7', TYPE_TABLET ],
+			'ViewPad 10e':								[ 'ViewSonic', 'ViewPad 10e', TYPE_TABLET ],
+			'VTAB1008':									[ 'Vizio', 'VTAB1008', TYPE_TABLET ],
+			'VTAB3010':									[ 'Vizio', 'VTAB3010', TYPE_TABLET ],
+			'VOTO W5300':								[ 'VOTO', 'W5300' ],
+			'xPAD-70':									[ 'WayteQ', 'xPAD-70', TYPE_TABLET ],
+			'xTAB-70':									[ 'WayteQ', 'xTAB-70', TYPE_TABLET ],
+			'WellcoM-A99':								[ 'WellcoM', 'A99' ],
+			'N12':										[ 'Window', 'N12', TYPE_TABLET ],
+			'N12R':										[ 'Window', 'N12R', TYPE_TABLET ],
+			'N50':										[ 'Window', 'N50', TYPE_TABLET ],
+			'N50DT':									[ 'Window', 'N50DT', TYPE_TABLET ],
+			'N50GT':									[ 'Window', 'N50GT', TYPE_TABLET ],
+			'N50GT A':									[ 'Window', 'N50GT-A', TYPE_TABLET ],
+			'N70':										[ 'Window', 'N70', TYPE_TABLET ],
+			'N70 DUAL CORE':							[ 'Window', 'N70 Dual Core', TYPE_TABLET ],
+			'N80':										[ 'Window', 'N80', TYPE_TABLET ],
+			'N90':										[ 'Window', 'N90', TYPE_TABLET ],
+			'N90 DUAL CORE2!':							[ 'Window', 'N90 Dual Core', TYPE_TABLET ],
+			'N612':										[ 'Wishway', 'N612' ],
+			'AT-AS43D':									[ 'Wolfgang', 'AT-AS43D' ],
+			'M12':										[ 'Wopad', 'M12', TYPE_TABLET ],
+			'WM8650':									[ 'WonderMedia', 'WM8650', TYPE_TABLET ],
+			'MI-ONE':									[ 'Xiaomi', 'MI-ONE' ],
+			'MI 1S':									[ 'Xiaomi', 'MI-ONE S' ],
+			'MI 1SC':									[ 'Xiaomi', 'MI-ONE SC' ],
+			'MI-ONE C1':								[ 'Xiaomi', 'MI-ONE C1' ],
+			'MI-ONE Plus':								[ 'Xiaomi', 'MI-ONE Plus' ],
+			'mione plus':								[ 'Xiaomi', 'MI-ONE Plus' ],
+			'MI-TWO':									[ 'Xiaomi', 'MI-TWO' ],
+			'Q07CL01':									[ 'XVision', 'Q07', TYPE_TABLET ],
+			'N6':										[ 'Yarvik', '210 Tablet', TYPE_TABLET ],
+			'EMR1879':									[ 'Yidong', 'EMR1879', TYPE_TABLET ],
+			'yusun W702':								[ 'Yusun', 'W702' ],
+			'YX-YUSUN E80':								[ 'Yusun', 'E80' ],
+			'zt180':									[ 'Zenithink', 'ZT-180', TYPE_TABLET ],
+			'Jaguar7':									[ 'ZiiLabs', 'Jaguar 7', TYPE_TABLET ],
+			'Ziss Ranger HD':							[ 'Ziss', 'Ranger HD' ],
+			'ZTE Libra':								[ STRINGS_ZTE, 'Libra' ],
+			'ZTE T T9':									[ STRINGS_ZTE, 'Light Tab T9', TYPE_TABLET ],
+			'V9':										[ STRINGS_ZTE, 'Light Tab V9', TYPE_TABLET ],
+			'V9e+':										[ STRINGS_ZTE, 'Light Tab 2', TYPE_TABLET ],
+			'V9A':										[ STRINGS_ZTE, 'Light Tab 2', TYPE_TABLET ],
+			'Light Tab 2W':								[ STRINGS_ZTE, 'Light Tab 2', TYPE_TABLET ],
+			'Light Tab 2':								[ STRINGS_ZTE, 'Light Tab 2', TYPE_TABLET ],
+			'V9C':										[ STRINGS_ZTE, 'Light Tab 3', TYPE_TABLET ],
+			'V55':										[ STRINGS_ZTE, 'Optik', TYPE_TABLET ],
+			'Acqua':									[ STRINGS_ZTE, 'Acqua' ],
+			'Blade(-V880|-opda)?$!':					[ STRINGS_ZTE, 'Blade' ],
+			'ZTE (U )?V880!':							[ STRINGS_ZTE, 'Blade' ],
+			'ZTE Blade':								[ STRINGS_ZTE, 'Blade' ],
+			'ZTE U(V)880+':								[ STRINGS_ZTE, 'Blade' ],
+			'V880':										[ STRINGS_ZTE, 'Blade' ],
+			'a5':										[ STRINGS_ZTE, 'Blade' ],
+			'Blade2':									[ STRINGS_ZTE, 'Blade 2' ],
+			'Blade S':									[ STRINGS_ZTE, 'Blade S' ],
+			'X500':										[ STRINGS_ZTE, 'Score' ],
+			'ZTE X500':									[ STRINGS_ZTE, 'Score' ],
+			'Skate':									[ STRINGS_ZTE, 'Skate' ],
+			'ZTE Skate':								[ STRINGS_ZTE, 'Skate' ],
+			'ZTE (U )?V960!':							[ STRINGS_ZTE, 'Skate' ],
+			'ZTE Racer':								[ STRINGS_ZTE, 'Racer' ],
+			'MTC 916':									[ STRINGS_ZTE, 'Racer' ],
+			'Racer':									[ STRINGS_ZTE, 'Racer' ],
+			'RacerII':									[ STRINGS_ZTE, 'Racer 2' ],
+			'ZTE Roamer':								[ STRINGS_ZTE, 'Roamer' ],
+			'N860':										[ STRINGS_ZTE, 'Warp' ],
+			'N880':										[ STRINGS_ZTE, 'Blade' ],
+			'ZTE T U802':								[ STRINGS_ZTE, 'T-U802' ],
+			'ZTE T U806':								[ STRINGS_ZTE, 'T-U806' ],
+			'ZTE T U812':								[ STRINGS_ZTE, 'T-U812' ],
+			'ZTE T U830':								[ STRINGS_ZTE, 'T-U830' ],
+			'ZTE T ?U880!':								[ STRINGS_ZTE, 'T-U880' ],
+			'ZTE T ?U900!':								[ STRINGS_ZTE, 'T-U900' ],	
+			'ZTE T ?U960!':								[ STRINGS_ZTE, 'T-U960' ],
+			'ZTE U N720':								[ STRINGS_ZTE, 'U-N720' ],
+			'ZTE U V856':								[ STRINGS_ZTE, 'U-V856' ],
+			'ZTE U V857':								[ STRINGS_ZTE, 'U-V857' ],
+			'ZTE U V881':								[ STRINGS_ZTE, 'U-V881' ],
+			'ZTE U X850':								[ STRINGS_ZTE, 'U-X850' ],
+			'ZTE U? X876!':								[ STRINGS_ZTE, 'U-X876' ],
+			'ZTE C R750':								[ STRINGS_ZTE, 'C-R750' ],
+			'ZTE C N600!':								[ STRINGS_ZTE, 'C-N600' ],
+			'ZTE C N606':								[ STRINGS_ZTE, 'C-N606' ],
+			'ZTE C N700':								[ STRINGS_ZTE, 'C-N700' ],
+			'ZTE C N760':								[ STRINGS_ZTE, 'C-N760' ],
+			'ZTE C N880!':								[ STRINGS_ZTE, 'C-N880' ],
+			'ZTE C X500':								[ STRINGS_ZTE, 'C-X500' ],
+			'ZTE C X920':								[ STRINGS_ZTE, 'C-X920' ],
+			'ZXY-ZTE-C X920':							[ STRINGS_ZTE, 'C-X920' ],
+			'ZTE GV821':								[ STRINGS_ZTE, 'G-V821' ],
+			'ZTE N880E':								[ STRINGS_ZTE, 'N880E' ],
+			'MIUI N880S':								[ STRINGS_ZTE, 'N880S' ],
+			'ZTE N882E':								[ STRINGS_ZTE, 'N882E' ],
+			'ZTE N910':									[ STRINGS_ZTE, 'N910' ],
+			'E810':										[ STRINGS_ZTE, 'E810' ],
+			'ZTE U880E':								[ STRINGS_ZTE, 'U880E' ],
+			'U880':										[ STRINGS_ZTE, 'U880' ],
+			'ZTE U885':									[ STRINGS_ZTE, 'U885' ],
+			'ZTE U930':									[ STRINGS_ZTE, 'U930' ],
+			'ZTE U970':									[ STRINGS_ZTE, 'U970' ],
+			'ZTE V768':									[ STRINGS_ZTE, 'V768' ],
+			'ZTE V788D':								[ STRINGS_ZTE, 'V788' ],
+			'ZTE V856':									[ STRINGS_ZTE, 'V856' ],
+			'ZTE V877b':								[ STRINGS_ZTE, 'V877' ],
+			'ZTE V889D':								[ STRINGS_ZTE, 'V889' ],
+			'ZTE V970':									[ STRINGS_ZTE, 'Z970' ],
+			'ZTE Z990!':								[ STRINGS_ZTE, 'Z990' ],
+			'003Z':										[ STRINGS_ZTE, 'Softbank 003Z' ],
+			'008Z':										[ STRINGS_ZTE, 'Softbank 008Z' ],
+			'009Z':										[ STRINGS_ZTE, 'Softbank Star7' ],
+			'ZP100':									[ 'Zopo', 'ZP100' ],
+			'ZP300':									[ 'Zopo', 'ZP300' ],
+			'ZP500':									[ 'Zopo', 'ZP500' ],
 	
-	var BREW_MODELS = {
-		'Coolpad D508':								[ STRINGS_COOLPAD, 'D508' ],
-		'Coolpad E600':								[ STRINGS_COOLPAD, 'E600' ],
-		'SCH-F839':									[ STRINGS_SAMSUNG, 'SCH-F839' ]
-	}
+			/* Telecom provider branded devices */
+			'i-mobile i691':							[ 'i-Mobile', 'i691' ],
+			'i-mobile i695':							[ 'i-Mobile', 'i695' ],
+			'i-mobile i858':							[ 'i-Mobile', 'i858' ],
+			'i-mobile 3G 8500':							[ 'i-Mobile', '3G 8500' ],
+			'i-mobile i-style Q1':						[ 'i-Mobile', 'i-Style Q1' ],						
+			'i-mobile i-STYLE Q2':						[ 'i-Mobile', 'i-Style Q2' ],						
+			'i-mobile I-Note':							[ 'i-Mobile', 'i-Note', TYPE_TABLET ],
 	
-	var WINDOWS_MOBILE_MODELS = {
-		'DX900':									[ STRINGS_ACER, 'Tempo DX900' ],
-		'F900':										[ STRINGS_ACER, 'Tempo F900' ],
-		'Coolpad F800':								[ STRINGS_COOLPAD, 'F800' ],
-		'garmin-asus-Nuvifone-M10':					[ 'Garmin-Asus', 'Nuvifone M10' ],
-		'HP iPAQ 510':								[ 'HP', 'iPAQ 510' ],
-		'HD mini T5555':							[ STRINGS_HTC, 'HD mini' ],
-		'HTC HD mini':								[ STRINGS_HTC, 'HD mini' ],
-		'HTC HD mini T5555':						[ STRINGS_HTC, 'HD mini' ],
-		'HTC HD2':									[ STRINGS_HTC, 'HD2' ],
-		'HTC HD2 T8585':							[ STRINGS_HTC, 'HD2' ],
-		'HD2 T8585':								[ STRINGS_HTC, 'HD2' ],
-		'T-Mobile LEO':								[ STRINGS_HTC, 'HD2' ],
-		'dopodT5588':								[ STRINGS_HTC, 'Hengshan' ],
-		'HTC Mega-T3333':							[ STRINGS_HTC, 'Mega' ],
-		'HTC Snap S521':							[ STRINGS_HTC, 'Snap' ],
-		'HTC Touch2 T3320':							[ STRINGS_HTC, 'Touch 2' ],
-		'HTC Touch2 T3333':							[ STRINGS_HTC, 'Touch 2' ],
-		'HTC Touch2 T3335':							[ STRINGS_HTC, 'Touch 2' ],
-		'HTC P3700':								[ STRINGS_HTC, 'Touch Diamond' ],
-		'HTC Touch Diamond2 T5353':					[ STRINGS_HTC, 'Touch Diamond 2' ],
-		'HTC Touch HD T8282':						[ STRINGS_HTC, 'Touch HD' ],
-		'HTC Touch HD T8283':						[ STRINGS_HTC, 'Touch HD' ],
-		'HTC Touch HD2 T8585':						[ STRINGS_HTC, 'Touch HD2' ],
-		'HTC Touch Pro2 T7373':						[ STRINGS_HTC, 'Touch Pro 2' ],
-		'T7380':									[ STRINGS_HTC, 'Touch Pro 2' ],
-		'HTC TyTN II':								[ STRINGS_HTC, 'TyTN II' ],
-		'GT-B7300':									[ STRINGS_SAMSUNG, 'Omnia Lite' ],
-		'GT-B7610':									[ STRINGS_SAMSUNG, 'Omnia Pro' ],
-		'GT-i8000':									[ STRINGS_SAMSUNG, 'Omnia 2' ],
-		'GT-I8000':									[ STRINGS_SAMSUNG, 'Omnia 2' ],
-		'GT-I8000U':								[ STRINGS_SAMSUNG, 'Omnia 2' ],
-		'M1i': 										[ STRINGS_SONY_ERICSSON, 'M1i Aspen' ]
-	}
+			'Optimus Boston':							[ 'Optimus', 'Boston' ],							/* Gigabyte GSmart G1305 */
+			'Optimus San Francisco':					[ 'Optimus', 'San Francisco' ],						/* ZTE Blade */
+			'Optimus Monte Carlo':						[ 'Optimus', 'Monte Carlo' ],						/* ZTE Skate */
+			
+			'Orange Boston':							[ 'Orange', 'Boston' ],								/* Gigabyte GSmart G1305 */
+			'Orange Monte Carlo':						[ 'Orange', 'Monte Carlo' ],						/* ZTE Skate */
+			'San Francisco':							[ 'Orange', 'San Francisco' ],						/* ZTE Blade */
+			'San Francisco for Orange':					[ 'Orange', 'San Francisco' ],						/* ZTE Blade */
+			'Orange San Francisco':						[ 'Orange', 'San Francisco' ],						/* ZTE Blade */
+			
+			'MOVE':										[ 'T-Mobile', 'MOVE' ],								/* Alcatel One Touch 908 */
+			'T-Mobile G1':								[ 'T-Mobile', 'G1' ],								/* HTC Dream */
+			'T-Mobile G2':								[ 'T-Mobile', 'G2' ],								/* HTC Desire Z */
+			'T-Mobile G2 Touch':						[ 'T-Mobile', 'G2' ],								/* HTC Desire Z */
+			'LG-P999':									[ 'T-Mobile', 'G2x' ],								/* LG Optimus 2X */
+			'LG-E739':									[ 'T-Mobile', 'myTouch' ],							/* LG E739 */
+			'T-Mobile myTouch 3G':						[ 'T-Mobile', 'myTouch 3G'],						/* HTC Magic */
+			'T-Mobile myTouch 3G Slide':				[ 'T-Mobile', 'myTouch 3G Slide' ],					/* HTC Espresso */
+			'T-Mobile Espresso':						[ 'T-Mobile', 'myTouch 3G Slide' ],					/* HTC Espresso */
+			'HTC myTouch 3G Slide':						[ 'T-Mobile', 'myTouch 3G Slide' ],					/* HTC Espresso */
+			'T-Mobile myTouch 4G':						[ 'T-Mobile', 'myTouch 4G' ],						/* HTC Glacier */
+			'HTC Glacier':								[ 'T-Mobile', 'myTouch 4G' ],						/* HTC Glacier */
+			'HTC Panache':								[ 'T-Mobile', 'myTouch 4G' ],						/* HTC Glacier */
+			'My ?Touch ?4G$!':							[ 'T-Mobile', 'myTouch 4G' ],						/* HTC Glacier */
+			'HTC My ?Touch ?4G$!':						[ 'T-Mobile', 'myTouch 4G' ],						/* HTC Glacier */
+			'HTC myTouch 4G Slide':						[ 'T-Mobile', 'myTouch 4G Slide' ],					/* HTC Doubleshot */
+			'myTouch 4G Slide':							[ 'T-Mobile', 'myTouch 4G Slide' ],					/* HTC Doubleshot */
+			'T-Mobile myTouch Q':						[ 'T-Mobile', 'myTouch Q' ],						/* Huawei U8730 */
+			'LG-C800':									[ 'T-Mobile', 'myTouch Q' ],
+			'Pulse Mini':								[ 'T-Mobile', 'Pulse Mini' ],						/* Huawei U8110 */
+			
+			'Vodafone 845':								[ 'Vodafone', '845 Nova' ],							/* Huawei U8100 */
+			'Vodafone 858':								[ 'Vodafone', '858 Smart' ],						/* Huawei U8160 */
+			'Vodafone 945':								[ 'Vodafone', '945' ],								/* ZTE Joe */
+			'Vodafone Smart II':						[ 'Vodafone', 'Smart II' ],
+			'SmartTab10':								[ 'Vodafone', 'SmartTab 10', TYPE_TABLET ]				/* ZTE Web Tab 10 */
+		};
+			
+		var TIZEN_MODELS = {
+			'GT-I9500':									[ STRINGS_SAMSUNG, 'GT-I9500' ]
+		}
 
-	var WINDOWS_PHONE_MODELS = {
-		'Acer': {
-			'Allegro':								[ STRINGS_ACER, 'Allegro' ],
-			'M310':									[ STRINGS_ACER, 'Allegro' ]
-		},
-		
-		'Asus': {
-			'Galaxy6':								[ STRINGS_ASUS, 'Galaxy 6' ]
-		},
-		
-		'DELL': {
-			'Venue Pro':							[ 'Dell', 'Venue Pro' ]
-		},
-		
-		'FujitsuToshibaMobileCommun': {
-			'IS12T':								[ 'Fujitsu Toshiba', 'IS12T' ]
-		},
-		
-		'HTC': {
-			'7 Mozart':								[ STRINGS_HTC, '7 Mozart' ],
-			'7 Mozart T8698':						[ STRINGS_HTC, '7 Mozart' ],
-			'T8697':								[ STRINGS_HTC, '7 Mozart' ],
-			'T8698':								[ STRINGS_HTC, '7 Mozart' ],
-			'PD67100':								[ STRINGS_HTC, '7 Mozart' ], 
-			'Mozart T8698':							[ STRINGS_HTC, '7 Mozart' ], 
-			'Mozart':								[ STRINGS_HTC, '7 Mozart' ], 
-			'USCCHTC-PC93100':						[ STRINGS_HTC, 'Arrive' ],
-			'Gold':									[ STRINGS_HTC, 'Gold	' ],
-			'HD2':									[ STRINGS_HTC, 'HD2' ],
-			'HD7':									[ STRINGS_HTC, 'HD7' ],
-			'HD7 T9292':							[ STRINGS_HTC, 'HD7' ],
-			'T9295':								[ STRINGS_HTC, 'HD7' ],
-			'T9296':								[ STRINGS_HTC, 'HD7' ],
-			'HD7 Infinity':							[ STRINGS_HTC, 'HD7' ],
-			'T7575':								[ STRINGS_HTC, '7 Pro' ],
-			'7 Pro T7576':							[ STRINGS_HTC, '7 Pro' ],
-			'mwp6985':								[ STRINGS_HTC, 'Trophy' ],
-			'7 Trophy T8686':						[ STRINGS_HTC, 'Trophy' ],
-			'7 Trophy':								[ STRINGS_HTC, 'Trophy' ],
-			'PC40100':								[ STRINGS_HTC, 'Trophy' ],
-			'Touch-IT Trophy':						[ STRINGS_HTC, 'Trophy' ],
-			'Radar':								[ STRINGS_HTC, 'Radar' ],
-			'Radar 4G':								[ STRINGS_HTC, 'Radar' ],
-			'Radar C110e':							[ STRINGS_HTC, 'Radar' ],
-			'Mazaa':								[ STRINGS_HTC, 'Mazaa' ], 
-			'Mondrian':								[ STRINGS_HTC, 'Mondrian' ],
-			'Schubert':								[ STRINGS_HTC, 'Schubert' ],
-			'7 Schubert T9292':						[ STRINGS_HTC, 'Schubert' ],
-			'Spark':								[ STRINGS_HTC, 'Spark' ],
-			'T8788':								[ STRINGS_HTC, 'Surround' ],
-			'TITAN X310e':							[ STRINGS_HTC, 'Titan' ],
-			'X310e':								[ STRINGS_HTC, 'Titan' ],
-			'PI39100':								[ STRINGS_HTC, 'Titan' ],
-			'PI86100':								[ STRINGS_HTC, 'Titan II' ],
-			'Ultimate':								[ STRINGS_HTC, 'Ultimate' ]
-		},
-		
-		'LG': {
-			'GW910':								[ STRINGS_LG, 'Optimus 7' ],
-			'LG E-900':								[ STRINGS_LG, 'Optimus 7 E900' ],
-			'LG-E900':								[ STRINGS_LG, 'Optimus 7 E900' ],
-			'LG-E900h':								[ STRINGS_LG, 'Optimus 7 E900' ],
-			'LG-C900':								[ STRINGS_LG, 'Optimus 7Q' ],
-			'LG-C900B':								[ STRINGS_LG, 'Quantum' ],
-			'LG-C900k':								[ STRINGS_LG, 'Quantum' ]
-		},
-		
-		'nokia': {
-			'SeaRay':								[ 'Nokia', 'Lumia 800' ],
-			'800C':									[ 'Nokia', 'Lumia 800' ]
-		},
-		
-		'Nokia': {
-			'Lumia 710':							[ 'Nokia', 'Lumia 710' ]
-		},
+		var TOUCHWIZ_MODELS = {
+			'GT-S3370C':								[ STRINGS_SAMSUNG, 'Corby 3G' ],
+			'GT-S36(50|53)!':							[ STRINGS_SAMSUNG, 'Corby' ],
+			'GT-S3850':									[ STRINGS_SAMSUNG, 'Corby II' ],
+			'GT-S52(30|33)!':							[ STRINGS_SAMSUNG, 'Star' ],
+			'GT-S5260':									[ STRINGS_SAMSUNG, 'Star II' ],
+			'GT-S5560':									[ STRINGS_SAMSUNG, 'Marvel' ],
+			'GT-S5620!':								[ STRINGS_SAMSUNG, 'Monte' ],
+			'GT-S5680':									[ STRINGS_SAMSUNG, 'GT-S5680' ],
+			'GT-S7550':									[ STRINGS_SAMSUNG, 'Blue Earth' ],
+			'GT-S80(00|03)!':							[ STRINGS_SAMSUNG, 'Jet' ],
+			'SGH-F480':									[ STRINGS_SAMSUNG, 'Tocco' ],
+			'SGH-T528g':								[ STRINGS_SAMSUNG, 'Straight Talk' ],
+			'GT-B3410':									[ STRINGS_SAMSUNG, 'Star Qwerty' ],
+			'GT-B5310':									[ STRINGS_SAMSUNG, 'Corby Pro' ],
+			'GT-B7722':									[ STRINGS_SAMSUNG, 'Star Duos' ],
+			'GT-C6712':									[ STRINGS_SAMSUNG, 'Star II Duos' ]
+		}
 		
-		'NOKIA': {
-			'710':									[ 'Nokia', 'Lumia 710' ],
-			'Nokia 710':							[ 'Nokia', 'Lumia 710' ],
-			'Lumia 710':							[ 'Nokia', 'Lumia 710' ],
-			'Lumia 719':							[ 'Nokia', 'Lumia 719' ],
-			'Nokia 800C':							[ 'Nokia', 'Lumia 800' ],
-			'Nokia 800':							[ 'Nokia', 'Lumia 800' ],
-			'Lumia 800':							[ 'Nokia', 'Lumia 800' ],
-			'800':									[ 'Nokia', 'Lumia 800' ],
-			'Lumia 900':							[ 'Nokia', 'Lumia 900' ],
-			'XXX':									[ 'Nokia', 'prototype' ]
-		},
+		var BADA_MODELS = {
+			'GT- ?S52(50|53)!':							[ STRINGS_SAMSUNG, 'Wave 525' ],
+			'GT-S5330':									[ STRINGS_SAMSUNG, 'Wave 533' ],
+			'GT-S5380!':								[ STRINGS_SAMSUNG, 'Wave Y' ],
+			'GT-S57(50|53)!':							[ STRINGS_SAMSUNG, 'Wave 575' ],
+			'GT-S72(30|33)!':							[ STRINGS_SAMSUNG, 'Wave 723' ],
+			'GT-S7250!':								[ STRINGS_SAMSUNG, 'Wave M' ],
+			'GT-S8500!':								[ STRINGS_SAMSUNG, 'Wave' ],
+			'GT-S8530':									[ STRINGS_SAMSUNG, 'Wave II' ],
+			'GT-S8600':									[ STRINGS_SAMSUNG, 'Wave 3' ],
+			'SHW-M410':									[ STRINGS_SAMSUNG, 'Wave 3' ]
+		}
 		
-		'SAMSUNG': {
-			'GT-I8350':								[ STRINGS_SAMSUNG, 'Omnia W' ],
-			'GT-I8350T':							[ STRINGS_SAMSUNG, 'Omnia W' ],
-			'SGH-i677':								[ STRINGS_SAMSUNG, 'Focus Flash' ],
-			'SGH-i707':								[ STRINGS_SAMSUNG, 'Taylor' ],
-			'SGH-i917':								[ STRINGS_SAMSUNG, 'Focus' ],
-			'SGH-i917R':							[ STRINGS_SAMSUNG, 'Focus' ],
-			'SGH-I917':								[ STRINGS_SAMSUNG, 'Focus' ],
-			'SGH-i937':								[ STRINGS_SAMSUNG, 'Focus S' ],
-			'OMNIA7':								[ STRINGS_SAMSUNG, 'Omnia 7' ],
-			'OMINA7':								[ STRINGS_SAMSUNG, 'Omnia 7' ],
-			'Taylor':								[ STRINGS_SAMSUNG, 'Taylor' ]
-		},
-
-		'TOSHIBA': {
-			'TSUNAGI':								[ 'Toshiba', 'Tsunagi' ]
+		var BREW_MODELS = {
+			'Coolpad D508':								[ STRINGS_COOLPAD, 'D508' ],
+			'Coolpad E600':								[ STRINGS_COOLPAD, 'E600' ],
+			'SCH-F839':									[ STRINGS_SAMSUNG, 'SCH-F839' ]
 		}
-	};
 
-	var ANDROID_MODELS = {
-		/* Generic identifiers */
-		'Android':									[ null, null ],		
-		'google sdk':								[ null, null ],		
-		'sdk':										[ null, null ],
-		'generic':									[ null, null ],
-		'generic x86':								[ null, null ],
-		
-		/* Development boards and kits */
-		'amd brazos':								[ 'AMD', 'Fusion' + STRINGS_BASED ],
-		'Amlogic M1 reference board':				[ 'Amlogic', 'M1 reference board' ],
-		'AML8726M':									[ 'Amlogic', 'AML8726-M' + STRINGS_BASED ],
-		'vexpress a9':								[ 'ARM', 'Versatile Express development platform' ],
-		'bcm7231':									[ 'Broadcom', 'BCM7231' + STRINGS_BASED, 'television' ],
-		'bcm7425':									[ 'Broadcom', 'BCM7425' + STRINGS_BASED, 'television' ],
-		'bcm7429':									[ 'Broadcom', 'BCM7429' + STRINGS_BASED, 'television' ],
-		'imx50 rdp':								[ 'Freescale', 'i.MX50' + STRINGS_BASED ],
-		'imx51 bbg':								[ 'Freescale', 'i.MX51' + STRINGS_BASED ],
-		'imx53 loco':								[ 'Freescale', 'i.MX53' + STRINGS_BASED ],
-		'imx53 mp204f3':							[ 'Freescale', 'i.MX53' + STRINGS_BASED ],
-		'imx53 smd':								[ 'Freescale', 'i.MX53' + STRINGS_BASED ],
-		'imx53 yeagle':								[ 'Freescale', 'i.MX53' + STRINGS_BASED ],
-		'imx6q':									[ 'Freescale', 'i.MX6Q' + STRINGS_BASED ],
-		'ODROID-A':									[ 'Hardkernel', 'ODROID-A developer tablet', 'tablet' ],
-		'mfld dv10':								[ 'Intel', 'Medfield' + STRINGS_BASED ],
-		'mfld dv20':								[ 'Intel', 'Medfield' + STRINGS_BASED ],
-		'mfld lw00':								[ 'Intel', 'Medfield' + STRINGS_BASED ],
-		'mfld pr2':									[ 'Intel', 'Medfield' + STRINGS_BASED ],
-		'mfld pr3':									[ 'Intel', 'Medfield' + STRINGS_BASED ],
-		'berlin bg2':								[ 'Marvell', 'Armada 1000' + STRINGS_BASED, 'television' ],
-		'MStar Amber3':								[ 'MStar', 'Amber3' + STRINGS_BASED ],
-		'Konka Amber3':								[ 'MStar', 'Amber3' + STRINGS_BASED ],
-		'mt5396':									[ 'Mediatek', 'MT5396' + STRINGS_BASED, 'television' ],
-		'bird75v2':									[ 'Mediatek', 'MT6575' + STRINGS_BASED ],
-		'eagle75v1 2':								[ 'Mediatek', 'MT6575' + STRINGS_BASED ],
-		'mt6575 phone':								[ 'Mediatek', 'MT6575' + STRINGS_BASED ],		
-		'mt8658':									[ 'Mediatek', 'MT8658' + STRINGS_BASED ],
-		'MBX DVBT reference board (c03ref)':		[ 'MXB', 'DVBT reference board', 'television' ],
-		'NS2816':									[ 'Nufront', 'NuSmart 2816' + STRINGS_BASED ],
-		'Ventana':									[ 'nVidia', 'Tegra Ventana development kit' ],
-		'Cardhu':									[ 'nVidia', 'Tegra 3' + STRINGS_BASED ],
-		'Panda':									[ 'Pandaboard', 'Development Kit' ],
-		'pandaboard':								[ 'Pandaboard', 'Development Kit' ],
-		'PandaBoard':								[ 'Pandaboard', 'Development Kit' ],
-		'MSM':										[ STRINGS_QUALCOMM, 'Snapdragon' + STRINGS_BASED ],
-		'msm7227 ffa':								[ STRINGS_QUALCOMM, 'Snapdragon S1' + STRINGS_BASED ],
-		'msm7627 surf':								[ STRINGS_QUALCOMM, 'Snapdragon S1' + STRINGS_BASED ],
-		'msm7627a':									[ STRINGS_QUALCOMM, 'Snapdragon S1' + STRINGS_BASED ],
-		'msm7627a sku1':							[ STRINGS_QUALCOMM, 'Snapdragon S1' + STRINGS_BASED ],
-		'msm7627a sku3':							[ STRINGS_QUALCOMM, 'Snapdragon S1' + STRINGS_BASED ],
-		'msm7630 fusion':							[ STRINGS_QUALCOMM, 'Snapdragon S2' + STRINGS_BASED ],
-		'msm7630 surf':								[ STRINGS_QUALCOMM, 'Snapdragon S2' + STRINGS_BASED ],
-		'msm8625':									[ STRINGS_QUALCOMM, 'Snapdragon S4' + STRINGS_BASED ],
-		'msm8660 cougar':							[ STRINGS_QUALCOMM, 'Snapdragon S3' + STRINGS_BASED ],
-		'msm8660 surf':								[ STRINGS_QUALCOMM, 'Snapdragon S3' + STRINGS_BASED ],
-		'msm8960':									[ STRINGS_QUALCOMM, 'Snapdragon S4' + STRINGS_BASED ],
-		'msm8974':									[ STRINGS_QUALCOMM, 'Snapdragon' + STRINGS_BASED ],
-		'rk2808sdk':								[ 'Rockchip', 'RK2808' + STRINGS_BASED ],
-		'RK2818':									[ 'Rockchip', 'RK2818' + STRINGS_BASED ],
-		'rk2818sdk':								[ 'Rockchip', 'RK2818' + STRINGS_BASED ],
-		'Android-for-Rockchip-2818':				[ 'Rockchip', 'RK2818' + STRINGS_BASED ],
-		'rk29sdk':									[ 'Rockchip', 'RK29' + STRINGS_BASED ],
-		'Rk29sdk':									[ 'Rockchip', 'RK29' + STRINGS_BASED ],
-		'rk30sdk':									[ 'Rockchip', 'RK30' + STRINGS_BASED ],
-		's3c6410':									[ STRINGS_SAMSUNG, 'S3C6410' + STRINGS_BASED ],
-		'smdk6410':									[ STRINGS_SAMSUNG, 'S3C6410' + STRINGS_BASED ],
-		'SMDKC110':									[ STRINGS_SAMSUNG, 'Exynos 3110' + STRINGS_BASED ],
-		'SMDKV210':									[ STRINGS_SAMSUNG, 'Exynos 4210' + STRINGS_BASED ],
-		'S5PV210':									[ STRINGS_SAMSUNG, 'Exynos 4210' + STRINGS_BASED ],
-		'sec smdkc210':								[ STRINGS_SAMSUNG, 'Exynos 4210' + STRINGS_BASED ],
-		'SMDK4x12':									[ STRINGS_SAMSUNG, 'Exynos 4212 or 4412' + STRINGS_BASED ],
-		'smp86xx':									[ 'Sigma', 'SMP86xx' + STRINGS_BASED, 'television' ],
-		'sv8860':									[ 'Skyviia', 'SV8860' + STRINGS_BASED, 'television' ],
-		'ste u8500':								[ 'ST Ericsson', 'Novathor U8500' + STRINGS_BASED ],
-		'Telechips M801 Evaluation Board':			[ 'Telechips', 'M801' + STRINGS_BASED, 'television' ],
-		'Telechips TCC8900 Evaluation Board':		[ 'Telechips', 'TCC8900' + STRINGS_BASED, 'television' ],
-		'TCC8920 STB EV':							[ 'Telechips', 'TCC8920' + STRINGS_BASED, 'television' ],
-		'OMAP':										[ STRINGS_TI, 'OMAP' + STRINGS_BASED ],
-		'OMAP SS':									[ STRINGS_TI, 'OMAP' + STRINGS_BASED ],
-		'LogicPD Zoom2':							[ STRINGS_TI, 'OMAP' + STRINGS_BASED ],
-		'omap3evm':									[ STRINGS_TI, 'OMAP3' + STRINGS_BASED ],
-		'Omap5sevm':								[ STRINGS_TI, 'OMAP5' + STRINGS_BASED ],
-		'pnx8473 kiryung':							[ 'Trident', 'PNX8473' + STRINGS_BASED, 'television' ],
-		
-		/* Official Google development devices */
-		'crespo':									[ 'Google', 'Nexus S' ],
-		'Crespo':									[ 'Google', 'Nexus S' ],
-		'Crespo4G':									[ 'Google', 'Nexus S' ],
-		'Passion':									[ 'Google', 'Nexus One' ],
-		'Bravo':									[ STRINGS_HTC, 'Desire' ],
-		'dream':									[ STRINGS_HTC, 'Dream' ],
-		'Vogue':									[ STRINGS_HTC, 'Touch' ],
-		'Vendor Optimus':							[ STRINGS_LG, 'Optimus' ],
-		'Stingray':									[ STRINGS_MOTOROLA, 'XOOM', 'tablet' ],
-		'Wingray':									[ STRINGS_MOTOROLA, 'XOOM', 'tablet' ],
-		'maguro':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
-		'Maguro':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
-		'Toro-VZW':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
-		'blaze':									[ STRINGS_TI, 'Blaze Tablet', 'tablet' ],
-		'Blaze':									[ STRINGS_TI, 'Blaze Tablet', 'tablet' ],
-		'Blaze Tablet':								[ STRINGS_TI, 'Blaze Tablet', 'tablet' ],
-		
-		/* Middleware and emulators */
-		'BlueStacks':								[ 'BlueStacks', 'App Player', 'desktop' ],
-		'youwave custom':							[ 'Youwave', 'Android on PC', 'desktop' ],
-		'BlackBerry Runtime for Android Apps':		[ 'RIM', 'BlackBerry (Android Runtime)', 'mobile' ],
-		
-		/* Regular devices */
-		'A100':										[ STRINGS_ACER, 'Iconia Tab A100', 'tablet' ],
-		'A101':										[ STRINGS_ACER, 'Iconia Tab A101', 'tablet' ],
-		'A200':										[ STRINGS_ACER, 'Iconia Tab A200', 'tablet' ],
-		'A211':										[ STRINGS_ACER, 'Iconia Tab A211', 'tablet' ],
-		'A500':										[ STRINGS_ACER, 'Iconia Tab A500', 'tablet' ],
-		'A501':										[ STRINGS_ACER, 'Iconia Tab A501', 'tablet' ],
-		'A510':										[ STRINGS_ACER, 'Iconia Tab A510', 'tablet' ],
-		'A511':										[ STRINGS_ACER, 'Iconia Tab A511', 'tablet' ],
-		'A700':										[ STRINGS_ACER, 'Iconia Tab A700', 'tablet' ],
-		'P2A700':									[ STRINGS_ACER, 'Iconia Tab A700', 'tablet' ],
-		'A701':										[ STRINGS_ACER, 'Iconia Tab A701', 'tablet' ],
-		'Acer A800':								[ STRINGS_ACER, 'Iconia Tab A800', 'tablet' ],
-		'E110':										[ STRINGS_ACER, 'beTouch E110' ],
-		'E120':										[ STRINGS_ACER, 'beTouch E120' ],
-		'E130':										[ STRINGS_ACER, 'beTouch E130' ],
-		'E140':										[ STRINGS_ACER, 'beTouch E140' ],
-		'E210':										[ STRINGS_ACER, 'beTouch E210' ],
-		'E310':										[ STRINGS_ACER, 'Liquid mini' ],
-		'E320':										[ STRINGS_ACER, 'Liquid Express' ],
-		'E330':										[ STRINGS_ACER, 'Liquid Glow' ],
-		'E400':										[ STRINGS_ACER, 'beTouch E400' ],
-		'G100W':									[ STRINGS_ACER, 'G100W' ],
-		'S100':										[ STRINGS_ACER, 'Liquid' ],
-		'S110':										[ STRINGS_ACER, 'Stream' ],
-		'S120':										[ STRINGS_ACER, 'Liquid mt' ],
-		'S300':										[ STRINGS_ACER, 'Iconia Smart' ],
-		'S500':										[ STRINGS_ACER, 'CloudMobile' ],
-		'TD600':									[ STRINGS_ACER, 'beTouch TD600' ],
-		'Liquid':									[ STRINGS_ACER, 'Liquid' ],
-		'Liquid E':									[ STRINGS_ACER, 'Liquid E' ],
-		'Liquid Mt':								[ STRINGS_ACER, 'Liquid mt' ],
-		'Liquid MT':								[ STRINGS_ACER, 'Liquid mt' ],
-		'Liquid Metal':								[ STRINGS_ACER, 'Liquid mt' ],
-		'Stream':									[ STRINGS_ACER, 'Stream' ],
-		'N700':										[ 'aigo', 'N700', 'tablet' ],
-		'M801':										[ 'aigo', 'M801', 'tablet' ],
-		'Novo7':									[ 'Ainovo', 'Novo7', 'tablet' ],
-		'Novo7 Aurora':								[ 'Ainovo', 'Novo7 Aurora', 'tablet' ],
-		'Novo7 Advanced':							[ 'Ainovo', 'Novo7 Advanced', 'tablet' ],
-		'Novo7 Advanced2':							[ 'Ainovo', 'Novo7 Advanced 2', 'tablet' ],
-		'Novo7 Basic':								[ 'Ainovo', 'Novo7 Basic', 'tablet' ],
-		'Novo7 ELF':								[ 'Ainovo', 'Novo7 Elf', 'tablet' ],
-		'Novo7 Fire':								[ 'Ainovo', 'Novo7 Fire', 'tablet' ],
-		'Novo7 PALADIN':							[ 'Ainovo', 'Novo7 Paladin', 'tablet' ],
-		'Novo8 Advanced':							[ 'Ainovo', 'Novo8 Advanced', 'tablet' ],
-		'one touch 890':							[ STRINGS_ALCATEL, 'One Touch 890' ],
-		'one touch 890D':							[ STRINGS_ALCATEL, 'One Touch 890' ],
-		'one touch 891':							[ STRINGS_ALCATEL, 'One Touch 891' ],
-		'ONE TOUCH 903':							[ STRINGS_ALCATEL, 'One Touch 903SHV-E170K' ],
-		'one touch 906':							[ STRINGS_ALCATEL, 'One Touch 906' ],
-		'one touch 908':							[ STRINGS_ALCATEL, 'One Touch 908' ],
-		'one touch 908F':							[ STRINGS_ALCATEL, 'One Touch 908' ],
-		'one touch 908S':							[ STRINGS_ALCATEL, 'One Touch 908' ],
-		'one touch 910':							[ STRINGS_ALCATEL, 'One Touch 910' ],
-		'one touch 918':							[ STRINGS_ALCATEL, 'One Touch 918' ],
-		'one touch 918D':							[ STRINGS_ALCATEL, 'One Touch 918' ],
-		'ONE TOUCH 918D':							[ STRINGS_ALCATEL, 'One Touch 918' ],
-		'one touch 918M':							[ STRINGS_ALCATEL, 'One Touch 918' ],
-		'one touch 918N':							[ STRINGS_ALCATEL, 'One Touch 918' ],
-		'one touch 980':							[ STRINGS_ALCATEL, 'One Touch 980' ],
-		'one touch 980A':							[ STRINGS_ALCATEL, 'One Touch 980' ],
-		'one touch 981A':							[ STRINGS_ALCATEL, 'One Touch 981' ],
-		'one touch 986':							[ STRINGS_ALCATEL, 'One Touch 986' ],
-		'one touch 990':							[ STRINGS_ALCATEL, 'One Touch 990' ],
-		'one touch 990A':							[ STRINGS_ALCATEL, 'One Touch 990' ],
-		'one touch 991':							[ STRINGS_ALCATEL, 'One Touch 991' ],
-		'one touch 991D':							[ STRINGS_ALCATEL, 'One Touch 991' ],
-		'ONE TOUCH 993':							[ STRINGS_ALCATEL, 'One Touch 993' ],
-		'one touch 995':							[ STRINGS_ALCATEL, 'One Touch 995' ],
-		'Telenor OneTouch':							[ STRINGS_ALCATEL, 'One Touch 990' ],
-		'OT 918':									[ STRINGS_ALCATEL, 'One Touch 918' ],
-		'Venture':									[ STRINGS_ALCATEL, 'Venture' ],
-		'Allwinner A10':							[ 'AllWinner', 'A10', 'tablet' ],
-		'97FC':										[ 'AllWinner', 'A10 97FC', 'tablet' ],
-		'Kindle Fire':								[ 'Amazon', 'Kindle Fire', 'tablet' ],
-		'Amazon Kindle Fire':						[ 'Amazon', 'Kindle Fire', 'tablet' ],
-		'AMD120':									[ 'AnyDATA', 'AnyTAB AMD120', 'tablet' ],
-		'MW0811':									[ 'AOC', 'Breeze MW0811', 'tablet' ],
-		'MW0821 V2.0':								[ 'AOC', 'Breeze MW0821', 'tablet' ],
-		'MW0922':									[ 'AOC', 'Breeze MW0922', 'tablet' ],
-		'Apanda A60':								[ 'Apanda', 'A60' ],
-		'apanda-A60':								[ 'Apanda', 'A60' ],
-		'A80KSC':									[ STRINGS_ARCHOS, 'Arnova 8', 'tablet' ],
-		'AN7CG2':									[ STRINGS_ARCHOS, 'Arnova 7', 'tablet' ],
-		'A101B':									[ STRINGS_ARCHOS, 'Arnova 10', 'tablet' ],
-		'AN10BG2DT':								[ STRINGS_ARCHOS, 'Arnova 10 B', 'tablet' ],
-		'AN10G2':									[ STRINGS_ARCHOS, 'Arnova 10 G2', 'tablet' ],
-		'A32':										[ STRINGS_ARCHOS, '32', 'media' ],
-		'A35DE':									[ STRINGS_ARCHOS, '35 Smart Home Phone' ],
-		'A43':										[ STRINGS_ARCHOS, '43', 'media' ],
-		'Archos5':									[ STRINGS_ARCHOS, '5', 'media' ],
-		'A70H':										[ STRINGS_ARCHOS, '7 Home Tablet', 'tablet' ],					// G7
-		'A70HB':									[ STRINGS_ARCHOS, '7 Home Tablet', 'tablet' ],
-		'A70BHT':									[ STRINGS_ARCHOS, '7 Home Tablet', 'tablet' ],
-		'A70CHT':									[ STRINGS_ARCHOS, '7 Home Tablet', 'tablet' ],
-		'A70S':										[ STRINGS_ARCHOS, '70 Internet Tablet', 'tablet' ],				// G8
-		'A7EB':										[ STRINGS_ARCHOS, '70B Internet Tablet', 'tablet' ],
-		'ARCHOS 70it2':								[ STRINGS_ARCHOS, '70B Internet Tablet', 'tablet' ],		
-		'A101IT':									[ STRINGS_ARCHOS, '101 Internet Tablet', 'tablet' ],		
-		'ARCHOS 80G9':								[ STRINGS_ARCHOS, '80 G9', 'tablet' ],							// G9
-		'ARCHOS 101G9':								[ STRINGS_ARCHOS, '101 G9', 'tablet' ],						
-		'ARCHOS 97XSLG10':							[ STRINGS_ARCHOS, '97 XS', 'tablet' ],							// G10
-		'ARCHOS 101G10':							[ STRINGS_ARCHOS, '101 XS', 'tablet' ],
-		'ARCHOS 97 CARBON':							[ STRINGS_ARCHOS, '97 Carbon', 'tablet' ],						// Elements
-		'ASTRI':									[ 'ASTRI', 'e-reader', 'ereader' ],
-		'eeepc':									[ STRINGS_ASUS, 'Eee Pc' ],
-		'asus laptop':								[ STRINGS_ASUS, 'Eee Pc' ],
-		'ME171':									[ STRINGS_ASUS, 'Eee Pad MeMO', 'tablet' ],
-		'Slider SL101':								[ STRINGS_ASUS, 'Eee Pad Slider', 'tablet' ],
-		'EPAD':										[ STRINGS_ASUS, 'Eee Pad Transformer', 'tablet' ],
-		'TF101':									[ STRINGS_ASUS, 'Eee Pad Transformer', 'tablet' ],
-		'Transformer TF101':						[ STRINGS_ASUS, 'Eee Pad Transformer', 'tablet' ],
-		'Transformer TF101G':						[ STRINGS_ASUS, 'Eee Pad Transformer', 'tablet' ],
-		'TF201':									[ STRINGS_ASUS, 'Eee Pad Transformer Prime', 'tablet' ],
-		'Transformer Prime TF201':					[ STRINGS_ASUS, 'Eee Pad Transformer Prime', 'tablet' ],
-		'Transformer Prime':						[ STRINGS_ASUS, 'Eee Pad Transformer Prime', 'tablet' ],
-		'Transformer Pad TF300T':					[ STRINGS_ASUS, 'Transformer Pad 300', 'tablet' ],
-		'Transformer Pad TF700T':					[ STRINGS_ASUS, 'Transformer Pad Infinity 700', 'tablet' ],
-		'ASUS Transformer TF300T':					[ STRINGS_ASUS, 'Transformer Pad 300', 'tablet' ],
-		'ASUS Transformer Pad TF300T':				[ STRINGS_ASUS, 'Transformer Pad 300', 'tablet' ],
-		'ASUS Transformer Pad TF300TG':				[ STRINGS_ASUS, 'Transformer Pad 300', 'tablet' ],
-		'ASUS Transformer Pad TF300TL':				[ STRINGS_ASUS, 'Transformer Pad 300', 'tablet' ],
-		'ASUS Transformer Pad TF700T':				[ STRINGS_ASUS, 'Transformer Pad Infinity 700', 'tablet' ],
-		'ASUS Transformer Pad TF700K':				[ STRINGS_ASUS, 'Transformer Pad Infinity 700', 'tablet' ],
-		'ASUS Transformer TF700K':					[ STRINGS_ASUS, 'Transformer Pad Infinity 700', 'tablet' ],
-		'PadFone':									[ STRINGS_ASUS, 'Padfone', 'tablet' ],
-		'OMS TTD':									[ STRINGS_ASUS, 'Eee Pc T10' ],
-		'ASUS T20':									[ STRINGS_ASUS, 'Eee Pc T20' ],
-		'ETBW11AA':									[ STRINGS_ASUS, 'Tough' ],
-		'AUX V900':									[ 'AUX', 'V900' ],
-		'PICOpad-QGN':								[ 'Axioo', 'Picopad QGN', 'tablet' ],
-		'NOOK':										[ STRINGS_BN, 'NOOK', 'ereader' ],
-		'NookColor':								[ STRINGS_BN, 'NOOK Color', 'ereader' ],
-		'NOOK BNRV200':								[ STRINGS_BN, 'NOOK Color', 'ereader' ],
-		'NOOK BNRV300':								[ STRINGS_BN, 'NOOK Color', 'ereader' ],
-		'NookTablet':								[ STRINGS_BN, 'NOOK Tablet', 'ereader' ],
-		'Nook Tablet':								[ STRINGS_BN, 'NOOK Tablet', 'ereader' ],
-		'NOOK BNTV250':								[ STRINGS_BN, 'NOOK Tablet', 'ereader' ],
-		'NOOK BNTV250A':							[ STRINGS_BN, 'NOOK Tablet', 'ereader' ],
-		'BNTV250':									[ STRINGS_BN, 'NOOK Tablet', 'ereader' ],
-		'BNTV250A':									[ STRINGS_BN, 'NOOK Tablet', 'ereader' ],
-		'NOOK Slate':								[ STRINGS_BN, 'NOOK Tablet', 'ereader' ],
-		'BenWee 5100':								[ 'BenWee', '5100' ],
-		'CA907AAC0G':								[ 'Besta', 'CA907AAC0G' ],
-		'BM999':									[ 'Bmorn', 'BM999', 'tablet' ],
-		'V11':										[ 'Bmorn', 'V11', 'tablet' ],
-		'V99':										[ 'Bmorn', 'V99', 'tablet' ],
-		'bq DaVinci':								[ 'bq', 'DaVinci', 'tablet' ],
-		'CT704':									[ 'Carrefour', 'CT704', 'tablet' ],
-		'CT1002':									[ 'Carrefour', 'CT1002', 'tablet' ],
-		'Camangi-Mangrove7':						[ 'Camangi', 'Mangrove 7', 'tablet' ],
-		'WS171':									[ 'Camangi', 'WebStation', 'tablet' ],
-		'IS11CA':									[ 'Casio', 'GzOne IS11CA' ],
-		'C771':										[ 'Casio', 'GzOne Commando' ],
-		'CAT NOVA':									[ 'Cat', 'NOVA', 'tablet' ],
-		'ChangHong-Z-ME':							[ 'ChangHong', 'Z-me' ],
-		'ARMM3V':									[ 'chinaleap', 'ARMM3V', 'tablet' ],
-		'CIUS-7':									[ 'Cisco', 'Cius', 'tablet' ],
-		'CIUS-7-AT':								[ 'Cisco', 'Cius', 'tablet' ],
-		'CSL Spice MI300':							[ 'CSL', 'Spice MI300' ],
-		'CSL-MI410':								[ 'CSL', 'Spice MI410' ],
-		'MID1024':									[ 'Coby', 'Kyros MID1024', 'tablet' ],
-		'MID1125':									[ 'Coby', 'Kyros MID1125', 'tablet' ],
-		'MID1126':									[ 'Coby', 'Kyros MID1126', 'tablet' ],
-		'MID7010':									[ 'Coby', 'Kyros MID7010', 'tablet' ],
-		'MID7012':									[ 'Coby', 'Kyros MID7012', 'tablet' ],
-		'MID7015':									[ 'Coby', 'Kyros MID7015', 'tablet' ],
-		'MID7015A':									[ 'Coby', 'Kyros MID7015', 'tablet' ],
-		'MID7016':									[ 'Coby', 'Kyros MID7016', 'tablet' ],
-		'MID7020':									[ 'Coby', 'Kyros MID7020', 'tablet' ],
-		'MID7022':									[ 'Coby', 'Kyros MID7022', 'tablet' ],
-		'MID7024':									[ 'Coby', 'Kyros MID7024', 'tablet' ],
-		'MID7025':									[ 'Coby', 'Kyros MID7025', 'tablet' ],
-		'MID7035':									[ 'Coby', 'Kyros MID7035', 'tablet' ],
-		'MID7127':									[ 'Coby', 'Kyros MID7127', 'tablet' ],
-		'MID8024':									[ 'Coby', 'Kyros MID8024', 'tablet' ],
-		'MID8125':									[ 'Coby', 'Kyros MID8125', 'tablet' ],
-		'MID8127':									[ 'Coby', 'Kyros MID8127', 'tablet' ],
-		'Z71':										[ 'Commtiva', 'Z71' ],
-		'V-T100':									[ 'Commtiva', 'V-T100' ],
-		'FIH-FB0':									[ 'Commtiva', 'HD700'],
-		'Coolpad D510':								[ STRINGS_COOLPAD, 'D510' ],
-		'D530':										[ STRINGS_COOLPAD, 'D530' ],
-		'Coolpad D530':								[ STRINGS_COOLPAD, 'D530' ],
-		'D539':										[ STRINGS_COOLPAD, 'D539' ],
-		'Coolpad D539':								[ STRINGS_COOLPAD, 'D539' ],
-		'E239':										[ STRINGS_COOLPAD, 'E239' ],
-		'Coolpad E239':								[ STRINGS_COOLPAD, 'E239' ],
-		'Coolpad N930':								[ STRINGS_COOLPAD, 'N930' ],
-		'N930':										[ STRINGS_COOLPAD, 'N930' ],
-		'Coolpad W706':								[ STRINGS_COOLPAD, 'W706' ],
-		'Coolpad W706+':							[ STRINGS_COOLPAD, 'W706' ],
-		'Coolpad W708':								[ STRINGS_COOLPAD, 'W708' ],
-		'W711':										[ STRINGS_COOLPAD, 'W711' ],
-		'Coolpad 5210':								[ STRINGS_COOLPAD, '5210' ],
-		'Coolpad 5820':								[ STRINGS_COOLPAD, '5820' ],
-		'5832':										[ STRINGS_COOLPAD, '5832' ],
-		'Coolpad 5832':								[ STRINGS_COOLPAD, '5832' ],
-		'5855':										[ STRINGS_COOLPAD, '5855' ],
-		'Coolpad 5860':								[ STRINGS_COOLPAD, '5860' ],
-		'Coolpad 5860+':							[ STRINGS_COOLPAD, '5860' ],
-		'5860':										[ STRINGS_COOLPAD, '5860' ],
-		'Coolpad 5870':								[ STRINGS_COOLPAD, '5870' ],
-		'Coolpad 7005':								[ STRINGS_COOLPAD, '7005' ],
-		'Coolpad 7019':								[ STRINGS_COOLPAD, '7019' ],
-		'7260':										[ STRINGS_COOLPAD, '7260' ],
-		'Coolpad 7260':								[ STRINGS_COOLPAD, '7260' ],
-		'Coolpad 7260A':							[ STRINGS_COOLPAD, '7260' ],
-		'Coolpad 8013':								[ STRINGS_COOLPAD, '8013' ],
-		'Coolpad 8026':								[ STRINGS_COOLPAD, '8026' ],
-		'Coolpad 8809':								[ STRINGS_COOLPAD, '8809' ],
-		'Coolpad 8810':								[ STRINGS_COOLPAD, '8810' ],
-		'8810':										[ STRINGS_COOLPAD, '8810' ],
-		'Coolpad 8811':								[ STRINGS_COOLPAD, '8811' ],
-		'Coolpad 9900':								[ STRINGS_COOLPAD, '9900' ],
-		'ZiiO7':									[ 'Creative', 'ZiiO 7', 'tablet' ],
-		'ZiiLABS ZiiO7':							[ 'Creative', 'ZiiO 7', 'tablet' ],
-		'ZiiLABS ZiiO10 ':							[ 'Creative', 'ZiiO 10', 'tablet' ],
-		'CUBE K8GT A':								[ 'Cube', 'K8GT A', 'tablet' ],
-		'CUBE K8GT B':								[ 'Cube', 'K8GT B', 'tablet' ],
-		'K8GT C':									[ 'Cube', 'K8GT C', 'tablet' ],
-		'K8GT H':									[ 'Cube', 'K8GT H', 'tablet' ],
-		'CUBE K8GT H':								[ 'Cube', 'K8GT H', 'tablet' ],
-		'K8GT W':									[ 'Cube', 'K8GT W', 'tablet' ],
-		'CUBE U8GT':								[ 'Cube', 'U8GT', 'tablet' ],
-		'CUBE U9GT':								[ 'Cube', 'U9GT', 'tablet' ],
-		'CUBE U9GT 2':								[ 'Cube', 'U9GT 2', 'tablet' ],
-		'Cube U9GT2':								[ 'Cube', 'U9GT 2', 'tablet' ],
-		'U9GT':										[ 'Cube', 'U9GT', 'tablet' ],
-		'U9GT2 From moage.com':						[ 'Cube', 'U9GT 2', 'tablet' ],
-		'N90 From moage.com':						[ 'Cube', 'U9GT 2', 'tablet' ],
-		'U9GT S':									[ 'Cube', 'U9GT S', 'tablet' ],
-		'U9GT S A':									[ 'Cube', 'U9GT SA', 'tablet' ],
-		'U9GTS A':									[ 'Cube', 'U9GT SA', 'tablet' ],
-		'U10GT 2':									[ 'Cube', 'U10GT 2', 'tablet' ],
-		'U10GT S':									[ 'Cube', 'U10GT S', 'tablet' ],
-		'U30GT-H':									[ 'Cube', 'U30GT H', 'tablet' ],
-		'CUBE Q7PRO':								[ 'Cube', 'Q7 Pro', 'tablet' ],
-		'CUBE Q7PRO J':								[ 'Cube', 'Q7 Pro', 'tablet' ],
-		'Cydle M7 (v0005.04.03.12.ko)':				[ 'Cydle', 'M7 MultiPAD', 'tablet' ],
-		'Dell Aero':								[ 'Dell', 'Aero' ],
-		'Dell M01M':								[ 'Dell', 'Mini 5', 'tablet' ],
-		'Dell Streak':								[ 'Dell', 'Streak', 'tablet' ],
-		'001DL':									[ 'Dell', 'Streak', 'tablet' ],
-		'101DL':									[ 'Dell', 'Streak Pro', 'tablet' ],
-		'GS01':										[ 'Dell', 'Streak Pro', 'tablet' ],
-		'Dell Streak Pro':							[ 'Dell', 'Streak Pro', 'tablet' ],
-		'streak7':									[ 'Dell', 'Streak 7', 'tablet' ],
-		'Dell Streak 7':							[ 'Dell', 'Streak 7', 'tablet' ],
-		'Dell Streak 10 Pro':						[ 'Dell', 'Streak 10 Pro', 'tablet' ],
-		'Dell V04B':								[ 'Dell', 'Streak V04B', 'tablet' ],
-		'Dell Venue':								[ 'Dell', 'Venue' ],
-		'Dell XCD35':								[ 'Dell', 'XCD35' ],
-		'XCD35':									[ 'Dell', 'XCD35' ],
-		'iDx7':										[ 'Digma', 'iDx7', 'tablet' ],
-		'iDx10':									[ 'Digma', 'iDx10', 'tablet' ],
-		'iDx10 3G':									[ 'Digma', 'iDx10', 'tablet' ],
-		'DM009SH':									[ 'Disney Mobile', 'DM009SH' ],
-		'DM010SH':									[ 'Disney Mobile', 'DM010SH' ],
-		'DM012SH':									[ 'Disney Mobile', 'DM012SH' ],
-		'F-08D':									[ 'Disney Mobile', 'F-08D' ],
-		'P-05D':									[ 'Disney Mobile', 'P-05D' ],
-		'Tablet-P27':								[ 'DracoTek', 'P27 Tablet', 'tablet' ],
-		'edgejr':									[ 'EnTourage', 'Pocket eDGe', 'tablet' ],
-		'l97D':										[ 'EPad', 'l97D', 'tablet' ],
-		'M4301':									[ 'Eston', 'MID M4301', 'media' ],
-		'P10AN':									[ 'Exper', 'Easypad P10AN', 'tablet' ],
-		'FIH-F0X':									[ 'FIH', 'F0X' ],
-		'Fly IQ260':								[ 'Fly', 'IQ260 BlackBird' ],
-		'ISW11F':									[ 'Fujitsu', 'Arrows Z' ],
-		'ISW13F':									[ 'Fujitsu', 'Arrows Z' ],
-		'IS12F':									[ 'Fujitsu', 'Arrows ES' ],
-		'F-01D':									[ 'Fujitsu', 'Arrows Tab LTE', 'tablet' ],
-		'F-03D':									[ 'Fujitsu', 'Arrows Kiss' ],
-		'F-05D':									[ 'Fujitsu', 'Arrows X LTE' ],
-		'F-07D':									[ 'Fujitsu', 'Arrows μ' ],
-		'F-10D':									[ 'Fujitsu', 'Arrows X F-10D' ],
-		'F-12C':									[ 'Fujitsu', 'Globetrotter' ],
-		'f12arc':									[ 'Fujitsu', 'F12arc' ],
-		'M532':										[ 'Fujitsu', 'Stylistic M532', 'tablet' ],
-		'Garminfone':								[ 'Garmin-Asus', 'Garminfone' ],
-		'Garmin-Asus A10':							[ 'Garmin-Asus', 'Nuvifone A10' ],
-		'Garmin-Asus A50':							[ 'Garmin-Asus', 'Nuvifone A50' ],
-		'TPA60W':									[ 'Gateway', 'TPA60W', 'tablet' ],
-		'Geeksphone ZERO':							[ 'Geeksphone', 'ZERO'],
-		'gemei G2':									[ 'Gemei', 'G2', 'tablet' ],
-		'Gemei G2':									[ 'Gemei', 'G2', 'tablet' ],
-		'gemei G3':									[ 'Gemei', 'G3', 'tablet' ],
-		'Gemei G9':									[ 'Gemei', 'G9', 'tablet' ],
-		'GSmart G1317D':							[ 'Gigabyte', 'GSmart G1317D' ],
-		'GSmart G1342':								[ 'Gigabyte', 'GSmart G1342' ],
-		'Gigabyte TB100':							[ 'Gigabyte', 'TB100', 'tablet' ],
-		'GIO-GiONEE C500':							[ 'Gionee', 'C500' ],
-		'GN105':									[ 'Gionee', 'GN105' ],		
-		'GN200':									[ 'Gionee', 'GN200' ],		
-		'GN205':									[ 'Gionee', 'GN205' ],
-		'Google Ion':								[ 'Google', 'Ion' ],
-		'Nexus One':								[ 'Google', 'Nexus One' ],
-		'NexusOne':									[ 'Google', 'Nexus One' ],
-		'HTC Nexus One':							[ 'Google', 'Nexus One' ],	
-		'Nexus S':									[ 'Google', 'Nexus S' ],
-		'Google Nexus S':							[ 'Google', 'Nexus S' ],
-		'Nexus S 4G':								[ 'Google', 'Nexus S 4G' ],
-		'Dooderbutt-4.0.3-v1':						[ 'Google', 'Nexus S 4G' ],
-		'Nexus 7':									[ 'Google', 'Nexus 7', 'tablet' ],
-		'Google Nexus 7':							[ 'Google', 'Nexus 7', 'tablet' ],
-		'Haier HW-W910':							[ 'Haier', 'HW-W910' ],
-		'SN10T1':									[ 'HANNspree', 'HANNSpad SN10T1', 'tablet' ],
-		'SN10T2':									[ 'HANNspree', 'HANNSpad SN10T2', 'tablet' ],
-		'HannsComb':								[ 'HANNspree', 'HANNSpad', 'tablet' ],
-		'X1':										[ 'HCL', 'ME X1', 'tablet' ],
-		'MID Serails':								[ 'Herotab', 'C8', 'tablet' ],
-		'MID Serials':								[ 'Herotab', 'C8', 'tablet' ],
-		'COSMO DUO':								[ 'Hiscreen', 'Cosmo DUO', 'tablet' ],
-		'HS-U8':									[ 'Hisense', 'U8' ],
-		'HS-T92':									[ 'Hisense', 'T92' ],
-		'HS-T96':									[ 'Hisense', 'T96' ],
-		'HS-E860':									[ 'Hisense', 'E860' ],
-		'E860':										[ 'Hisense', 'E860' ],
-		'HS-E910':									[ 'Hisense', 'E910' ],
-		'HS-E920':									[ 'Hisense', 'E920' ],
-		'HS-EG900':									[ 'Hisense', 'EG900' ],
-		'HS-ET919':									[ 'Hisense', 'ET919' ],
-		'EG968B':									[ 'Hisense', 'EG968B' ],
-		'HKPHONE H8-3G':							[ 'HKPhone', 'H8 3G' ],
-		'HOSIN U2':									[ 'Hosin', 'U2' ],
-		'Touchpad':									[ 'HP', 'TouchPad', 'tablet' ],
-		'HP Touchpad':								[ 'HP', 'TouchPad', 'tablet' ],
-		'cm tenderloin':							[ 'HP', 'TouchPad', 'tablet' ],
-		'aokp tenderloin':							[ 'HP', 'TouchPad', 'tablet' ],
-		'HTC Amaze 4G':								[ STRINGS_HTC, 'Amaze 4G' ],		/* T-Mobile */
-		'HTC Ruby':									[ STRINGS_HTC, 'Amaze 4G' ],
-		'HTC Amaze 4G(Ruby)':						[ STRINGS_HTC, 'Amaze 4G' ],
-		'Amaze 4G':									[ STRINGS_HTC, 'Amaze 4G' ],
-		'HTC Aria':									[ STRINGS_HTC, 'Aria' ],			/* AT&T */
-		'HTC Aria A6380':							[ STRINGS_HTC, 'Aria' ],			/* AT&T */
-		'HTC Liberty A6380':						[ STRINGS_HTC, 'Aria' ],
-		'HTC Liberty':								[ STRINGS_HTC, 'Aria' ],
-		'HTC A6366':								[ STRINGS_HTC, 'Aria' ],
-		'HTC Bee':									[ STRINGS_HTC, 'Bee' ],
-		'HTC ChaCha':								[ STRINGS_HTC, 'ChaCha' ],
-		'HTC ChaCha A810':							[ STRINGS_HTC, 'ChaCha' ],
-		'HTC ChaCha A810e':							[ STRINGS_HTC, 'ChaCha' ],
-		'HTC ChaChaCha A810e':						[ STRINGS_HTC, 'ChaCha' ],
-		'HTC A810e':								[ STRINGS_HTC, 'ChaCha' ],
-		'HTC A9188':								[ STRINGS_HTC, 'Cullinan' ],
-		'HTC Bravo':								[ STRINGS_HTC, 'Desire' ],
-		'HTC Desire':								[ STRINGS_HTC, 'Desire' ],
-		'HTC Desire A8181':							[ STRINGS_HTC, 'Desire' ],
-		'HTC Desire A8183':							[ STRINGS_HTC, 'Desire' ],
-		'HTC Desire Beats A8181':					[ STRINGS_HTC, 'Desire' ],
-		'HTC Desire CDMA':							[ STRINGS_HTC, 'Desire' ],
-		'HTC Desire SMS':							[ STRINGS_HTC, 'Desire' ],
-		'HTC Desire S.M.S':							[ STRINGS_HTC, 'Desire' ],
-		'HTC Desire C':								[ STRINGS_HTC, 'Desire C' ],
-		'HTC DesireHD':								[ STRINGS_HTC, 'Desire HD' ],
-		'HTC DesireHD A9191':						[ STRINGS_HTC, 'Desire HD' ],
-		'HTC DesireHD A9192':						[ STRINGS_HTC, 'Desire HD' ],
-		'HTC Desire HD A9191':						[ STRINGS_HTC, 'Desire HD' ],
-		'HTC A9191':								[ STRINGS_HTC, 'Desire HD' ],
-		'HTC A9191 for AT&T':						[ STRINGS_HTC, 'Desire HD' ],
-		'HTC A9192':								[ STRINGS_HTC, 'Desire HD' ],
-		'HTC Desire HD':							[ STRINGS_HTC, 'Desire HD' ],
-		'HTC Desire HD with Beats Audio':			[ STRINGS_HTC, 'Desire HD' ],
-		'HTC Desire S':								[ STRINGS_HTC, 'Desire S' ],
-		'HTC DesireS':								[ STRINGS_HTC, 'Desire S' ],
-		'HTC DesiresS':								[ STRINGS_HTC, 'Desire S' ],
-		'HTC DesireS S510e':						[ STRINGS_HTC, 'Desire S' ],
-		'HTC DesireS S510b':						[ STRINGS_HTC, 'Desire S' ],
-		'HTC Desire S S510e':						[ STRINGS_HTC, 'Desire S' ],
-		'HTC S510e':								[ STRINGS_HTC, 'Desire S' ],
-		'HTC Desire Saga':							[ STRINGS_HTC, 'Desire S' ],
-		'HTC Desire V':								[ STRINGS_HTC, 'Desire V' ],
-		'HTC T328w':								[ STRINGS_HTC, 'Desire V' ],
-		'HTC Desire VC':							[ STRINGS_HTC, 'Desire VC' ],
-		'HTC T328d':								[ STRINGS_HTC, 'Desire VC' ],
-		'HTC T328t':								[ STRINGS_HTC, 'Desire VT' ],
-		'HTC Desire Z':								[ STRINGS_HTC, 'Desire Z' ],
-		'HTC DesireZ':								[ STRINGS_HTC, 'Desire Z' ],	
-		'HTC DesireZ A7272':						[ STRINGS_HTC, 'Desire Z' ],
-		'HTC Desire Z A7272':						[ STRINGS_HTC, 'Desire Z' ],
-		'HTC Vision':								[ STRINGS_HTC, 'Desire Z' ],
-		'HTC A7275':								[ STRINGS_HTC, 'Desire Z' ],
-		'HTC Dream':								[ STRINGS_HTC, 'Dream' ],
-		'HTC S710d':								[ STRINGS_HTC, 'Droid Incredible 2' ],
-		'HTC Incredible 2':							[ STRINGS_HTC, 'Droid Incredible 2' ],
-		'HTC X515d':								[ STRINGS_HTC, 'EVO 3D' ],				/* Sprint */
-		'HTC X515m':								[ STRINGS_HTC, 'EVO 3D' ],
-		'HTC X515C':								[ STRINGS_HTC, 'EVO 3D' ],
-		'HTC Evo 3D':								[ STRINGS_HTC, 'EVO 3D' ],
-		'HTC EVO 3D':								[ STRINGS_HTC, 'EVO 3D' ],
-		'HTC EVO 3D GSM':							[ STRINGS_HTC, 'EVO 3D' ],
-		'HTC EVO 3D X515a':							[ STRINGS_HTC, 'EVO 3D' ],
-		'HTC EVO 3D GSM X515m':						[ STRINGS_HTC, 'EVO 3D' ],
-		'HTC EVO 3D X515m':							[ STRINGS_HTC, 'EVO 3D' ],
-		'HTC EVO 3D X515M':							[ STRINGS_HTC, 'EVO 3D' ],
-		'HTC EVO3D X515a':							[ STRINGS_HTC, 'EVO 3D' ],
-		'HTC EVO3D X515m':							[ STRINGS_HTC, 'EVO 3D' ],
-		'HTC Evo 3D X515m':							[ STRINGS_HTC, 'EVO 3D' ],
-		'HTC Evo 3D with Beats Audio X515m':		[ STRINGS_HTC, 'EVO 3D' ],
-		'HTC Evo 4G':								[ STRINGS_HTC, 'EVO 4G' ],
-		'HTC EVO 4G':								[ STRINGS_HTC, 'EVO 4G' ],
-		'HTC X515E':								[ STRINGS_HTC, 'EVO 4G+' ],
-		'HTC EVO 4G+ For Sprint':					[ STRINGS_HTC, 'EVO 4G+' ],
-		'HTC EVO 4G++ For Sprint':					[ STRINGS_HTC, 'EVO 4G+' ],
-		'HTC C715c':								[ STRINGS_HTC, 'EVO Design 4G' ],
-		'HTC Design 4G':							[ STRINGS_HTC, 'EVO Design 4G' ],		/* Sprint */
-		'HTC EVO design 4G':						[ STRINGS_HTC, 'EVO Design 4G' ],
-		'HTC EVO Design 4G':						[ STRINGS_HTC, 'EVO Design 4G' ],
-		'HTCEVODesign4G':							[ STRINGS_HTC, 'EVO Design 4G' ],
-		'HTC Evo Shift':							[ STRINGS_HTC, 'EVO Shift' ],
-		'HTC EVO Shift 4G':							[ STRINGS_HTC, 'EVO Shift' ],
-		'HTC A310e':								[ STRINGS_HTC, 'Explorer' ],
-		'HTC Explorer':								[ STRINGS_HTC, 'Explorer' ],
-		'HTC Explorer A310':						[ STRINGS_HTC, 'Explorer' ],
-		'HTC Explorer A310b':						[ STRINGS_HTC, 'Explorer' ],
-		'HTC Explorer A310e':						[ STRINGS_HTC, 'Explorer' ],
-		'HTC P510e':								[ STRINGS_HTC, 'Flyer', 'tablet' ],
-		'HTC Flyer':								[ STRINGS_HTC, 'Flyer', 'tablet' ],
-		'HTC Flyer P510e':							[ STRINGS_HTC, 'Flyer', 'tablet' ],
-		'HTC Flyer P512':							[ STRINGS_HTC, 'Flyer', 'tablet' ],
-		'HTC Flyer P512 NA':						[ STRINGS_HTC, 'Flyer', 'tablet' ],
-		'HTC P515E':								[ STRINGS_HTC, 'Flyer 4G', 'tablet' ],
-		'HTC Gratia A6380':							[ STRINGS_HTC, 'Gratia' ],
-		'HTC HD':									[ STRINGS_HTC, 'HD' ],
-		'HTC HD2':									[ STRINGS_HTC, 'HD2' ],
-		'HTC HD2 T8585':							[ STRINGS_HTC, 'HD2' ],
-		'HTC HD2(Leo)':								[ STRINGS_HTC, 'HD2' ],
-		'HTC HD7':									[ STRINGS_HTC, 'HD7' ],
-		'HTC T9299+':								[ STRINGS_HTC, 'HD7' ],
-		'HTC HD7 for Sprint':						[ STRINGS_HTC, 'HD7' ],
-		'HTC HD7 4G T9299 For AT&T':				[ STRINGS_HTC, 'HD7' ],
-		'HTC HD7 4G T9299+ For AT&T':				[ STRINGS_HTC, 'HD7' ],
-		'HTC T9299+ For AT&T':						[ STRINGS_HTC, 'HD7' ],
-		'HTC HD7S T9399+':							[ STRINGS_HTC, 'HD7s' ],
-		'HTC HD7S T9899+':							[ STRINGS_HTC, 'HD7s' ],
-		'HTC T9899+ For AT&T':						[ STRINGS_HTC, 'HD7s' ],
-		'VitMod ExtraLite 1.6.5.fullodex for HTC HD7 Pro':		[ STRINGS_HTC, 'HD7 Pro' ],
-		'HTC Hero':									[ STRINGS_HTC, 'Hero' ],
-		'HTC HERO':									[ STRINGS_HTC, 'Hero' ],
-		'HTC Hero CDMA':							[ STRINGS_HTC, 'Hero' ],
-		'HTC HERO CDMA':							[ STRINGS_HTC, 'Hero' ],
-		'HTC HERO200':								[ STRINGS_HTC, 'Hero 200' ],			/* Sprint */
-		'HTC Hero S':								[ STRINGS_HTC, 'Hero S' ],				/* US Cellular */
-		'HTC IMAGIO':								[ STRINGS_HTC, 'Imagio' ],
-		'HTC Incredible':							[ STRINGS_HTC, 'Incredible' ],
-		'HTC Incredible S710E':						[ STRINGS_HTC, 'Incredible S' ],
-		'HTC S710e':								[ STRINGS_HTC, 'Incredible S' ],
-		'HTC Incredible S':							[ STRINGS_HTC, 'Incredible S' ],
-		'HTC Incredible S S710e':					[ STRINGS_HTC, 'Incredible S' ],
-		'HTC Incredible S s710e':					[ STRINGS_HTC, 'Incredible S' ],
-		'HTC IncredibleS S710e':					[ STRINGS_HTC, 'Incredible S' ],
-		'HTC Incredible S with Beats Audio':		[ STRINGS_HTC, 'Incredible S' ],
-		'HTC Vivo':									[ STRINGS_HTC, 'Incredible S' ],
-		'HTC Innovation':							[ STRINGS_HTC, 'Innovation' ],
-		'HTC Inspire 4G':							[ STRINGS_HTC, 'Inspire 4G' ],			/* AT&T */	
-		'HTC HD7 Inspire 4G For Vodafone':			[ STRINGS_HTC, 'Inspire 4G' ],
-		'HTC P715a':								[ STRINGS_HTC, 'Jetstream', 'tablet' ],
-		'HTC Legend':								[ STRINGS_HTC, 'Legend' ],
-		'HTC Magic':								[ STRINGS_HTC, 'Magic' ],
-		'HTC Sapphire':								[ STRINGS_HTC, 'Magic' ],
-		'HTC Lexikon':								[ STRINGS_HTC, 'Merge' ],
-		'HTC One S':								[ STRINGS_HTC, 'One S' ],
-		'HTC Z520e':								[ STRINGS_HTC, 'One S' ],
-		'HTC Z560e':								[ STRINGS_HTC, 'One S' ],
-		'HTC One V':								[ STRINGS_HTC, 'One V' ],
-		'HTC T320e':								[ STRINGS_HTC, 'One V' ],
-		'HTC One X':								[ STRINGS_HTC, 'One X' ],
-		'HTC S720e':								[ STRINGS_HTC, 'One X' ],
-		'HTC Endeavour-LS':							[ STRINGS_HTC, 'One X' ],
-		'HTC One XL':								[ STRINGS_HTC, 'One XL' ],
-		'HTC X710a':								[ STRINGS_HTC, 'Raider 4G' ],
-		'HTC Raider':								[ STRINGS_HTC, 'Raider 4G' ],
-		'HTC Raider X710e':							[ STRINGS_HTC, 'Raider 4G' ],
-		'HTC Raider X710s':							[ STRINGS_HTC, 'Raider 4G' ],
-		'HTC Raider 4G X710e':						[ STRINGS_HTC, 'Raider 4G' ],
-		'HTC PH39100':								[ STRINGS_HTC, 'Raider 4G' ],
-		'HTC Holiday':								[ STRINGS_HTC, 'Raider 4G' ],
-		'HTC Velocity 4G X710s':					[ STRINGS_HTC, 'Raider 4G' ],
-		'HTC Rezound':								[ STRINGS_HTC, 'Rezound' ],
-		'HTC Rhyme S510b':							[ STRINGS_HTC, 'Rhyme' ],				/* Verizon */
-		'HTC S510b':								[ STRINGS_HTC, 'Rhyme' ],
-		'HTC Bliss':								[ STRINGS_HTC, 'Rhyme' ],
-		'HTC Bliss S510b':							[ STRINGS_HTC, 'Rhyme' ],
-		'HTC Salsa C510e':							[ STRINGS_HTC, 'Salsa' ],	
-		'HTC C510e':								[ STRINGS_HTC, 'Salsa' ],
-		'HTC Z710a':								[ STRINGS_HTC, 'Sensation' ],
-		'HTC Z710e':								[ STRINGS_HTC, 'Sensation' ],
-		'HTC Z710t':								[ STRINGS_HTC, 'Sensation' ],
-		'HTC Sensation':							[ STRINGS_HTC, 'Sensation' ],
-		'HTC Sensation Z710':						[ STRINGS_HTC, 'Sensation' ],
-		'HTC Sensation Z710a':						[ STRINGS_HTC, 'Sensation' ],
-		'HTC Sensation Z710e':						[ STRINGS_HTC, 'Sensation' ],
-		'HTC Sensation Z710E':						[ STRINGS_HTC, 'Sensation' ],
-		'HTC Sensation Z710e For AT&T':				[ STRINGS_HTC, 'Sensation' ],
-		'HTC Sensation Z710e with Beats Audio':		[ STRINGS_HTC, 'Sensation' ],
-		'HTC Sensation with Beats Audio Z710e':		[ STRINGS_HTC, 'Sensation' ],
-		'HTC Sensation with Beats Audio':			[ STRINGS_HTC, 'Sensation' ],
-		'HTC Sensation Taste':						[ STRINGS_HTC, 'Sensation' ],
-		'HTC Pyramid':								[ STRINGS_HTC, 'Sensation' ],
-		'HTC Pyramid Z710a':						[ STRINGS_HTC, 'Sensation' ],
-		'HTC Pyramid Z710e':						[ STRINGS_HTC, 'Sensation' ],
-		'HTC Sensation 4G':							[ STRINGS_HTC, 'Sensation' ],			/* T-Mobile */
-		'HTC Sensation 4G with Beats Audio':		[ STRINGS_HTC, 'Sensation' ],
-		'HTC Sensation G14':						[ STRINGS_HTC, 'Sensation' ],
-		'HTC Sensation G14 for AT&T':				[ STRINGS_HTC, 'Sensation' ],
-		'HTC G14 sensation':						[ STRINGS_HTC, 'Sensation' ],
-		'HTC Z715e':								[ STRINGS_HTC, 'Sensation XE' ],
-		'HTC Sensation Z715e':						[ STRINGS_HTC, 'Sensation XE' ],
-		'HTC SensationXE Beats':					[ STRINGS_HTC, 'Sensation XE' ],
-		'HTC SensationXE Beats Z715a':				[ STRINGS_HTC, 'Sensation XE' ],
-		'HTC SensationXE Beats Z715e':				[ STRINGS_HTC, 'Sensation XE' ],
-		'HTC Sensation XE':							[ STRINGS_HTC, 'Sensation XE' ],
-		'HTC Sensation XE Z715e':					[ STRINGS_HTC, 'Sensation XE' ],
-		'HTC SensationXE Z715e':					[ STRINGS_HTC, 'Sensation XE' ],
-		'HTC Sensation XE Beats':					[ STRINGS_HTC, 'Sensation XE' ],
-		'HTC SensationXE with Beats Audio':			[ STRINGS_HTC, 'Sensation XE' ],
-		'HTC Sensation XE with Beats Audio':		[ STRINGS_HTC, 'Sensation XE' ],
-		'HTC Sensation XE with Beats Audio Z715a':	[ STRINGS_HTC, 'Sensation XE' ],
-		'HTC Sensation Juredroid XE Beats Audio':	[ STRINGS_HTC, 'Sensation XE' ],
-		'HTC Sensation XE with Beats Audio Z715e':	[ STRINGS_HTC, 'Sensation XE' ],
-		'HTC Sensation XE With Beats Audio Z715e':	[ STRINGS_HTC, 'Sensation XE' ],
-		'HTC Sensation 4G XE with Beats Audio':		[ STRINGS_HTC, 'Sensation XE' ],
-		'HTC Sensation with Beats Audio Z715e':		[ STRINGS_HTC, 'Sensation XE' ],
-		'HTC X315E':								[ STRINGS_HTC, 'Sensation XL' ],
-		'HTC SensationXL Beats X315b':				[ STRINGS_HTC, 'Sensation XL' ],
-		'HTC SensationXL Beats X315e':				[ STRINGS_HTC, 'Sensation XL' ],
-		'HTC Sensation XL with Beats Audio X315b':	[ STRINGS_HTC, 'Sensation XL' ],
-		'HTC Sensation XL with Beats Audio X315e':	[ STRINGS_HTC, 'Sensation XL' ],
-		'HTC Runnymede':							[ STRINGS_HTC, 'Sensation XL' ],
-		'HTC X315E':								[ STRINGS_HTC, 'Sensation XL' ],	
-		'HTC G21':									[ STRINGS_HTC, 'Sensation XL' ],
-		'HTC PH06130':								[ STRINGS_HTC, 'Status' ],
-		'HTC Status':								[ STRINGS_HTC, 'Status' ],
-		'HTC Tattoo':								[ STRINGS_HTC, 'Tattoo' ],
-		'HTC TATTOO A3288':							[ STRINGS_HTC, 'Tattoo' ],
-		'HTC click':								[ STRINGS_HTC, 'Tattoo' ],
-		'HTC A9188':								[ STRINGS_HTC, 'Tianxi' ],
-		'HTC X310e':								[ STRINGS_HTC, 'Titan' ],
-		'HTC T7373':								[ STRINGS_HTC, 'Touch Pro II' ],
-		'HTC ThunderBolt':							[ STRINGS_HTC, 'ThunderBolt'],			/* Verizon */
-		'HTC Mecha':								[ STRINGS_HTC, 'ThunderBolt'],
-		'HTC Velocity 4G':							[ STRINGS_HTC, 'Velocity 4G'],
-		'HTC Wildfire':								[ STRINGS_HTC, 'Wildfire' ],			/* C-Spire */
-		'HTC Wildfire A3333':						[ STRINGS_HTC, 'Wildfire' ],
-		'HTC A3366':								[ STRINGS_HTC, 'Wildfire' ],
-		'HTC A3380':								[ STRINGS_HTC, 'Wildfire' ],
-		'HTC WildfireS':							[ STRINGS_HTC, 'Wildfire S' ],			/* T-Mobile, metroPCS, Virgin Mobile, US Cellular */
-		'HTC Wildfire S':							[ STRINGS_HTC, 'Wildfire S' ],
-		'Htc Wildfire s':							[ STRINGS_HTC, 'Wildfire S' ],
-		'HTC Wildfire S A510e':						[ STRINGS_HTC, 'Wildfire S' ],
-		'HTC Wildfire S A510b':						[ STRINGS_HTC, 'Wildfire S' ],
-		'HTC WildfireS A510e':						[ STRINGS_HTC, 'Wildfire S' ],
-		'HTC WildfireS A510b':						[ STRINGS_HTC, 'Wildfire S' ],
-		'htc wildfire s a510e':						[ STRINGS_HTC, 'Wildfire S' ],
-		'HTC Wildfire S A515c':						[ STRINGS_HTC, 'Wildfire S' ],
-		'HTC A510a':								[ STRINGS_HTC, 'Wildfire S' ],
-		'HTC A510e':								[ STRINGS_HTC, 'Wildfire S' ],
-		'HTC A510c':								[ STRINGS_HTC, 'Wildfire S' ],
-		'HTCX06HT':									[ STRINGS_HTC, 'Desire' ],
-		'HTC A6390':								[ STRINGS_HTC, 'A6390' ],
-		'HTC A8180':								[ STRINGS_HTC, 'A8180' ],
-		'HTC PG762':								[ STRINGS_HTC, 'PG762' ],
-		'HTC S715e':								[ STRINGS_HTC, 'S715e' ],
-		'HTC Z510d':								[ STRINGS_HTC, 'Z510d' ],
-		'HTC VLE U':								[ STRINGS_HTC, 'One S' ],
-		'HTC VLE#U':								[ STRINGS_HTC, 'One S' ],
-		'HTC VIE U':								[ STRINGS_HTC, 'One S' ],
-		'HTC EVA UL':								[ STRINGS_HTC, 'One V' ],
-		'HTC ENR U':								[ STRINGS_HTC, 'One X' ],
-		'ENR U':									[ STRINGS_HTC, 'One X' ],
-		'EndeavorU':								[ STRINGS_HTC, 'One X' ],
-		'Liberty':									[ STRINGS_HTC, 'Aria' ],
-		'Desire':									[ STRINGS_HTC, 'Desire' ],
-		'Desire A8181':								[ STRINGS_HTC, 'Desire' ],
-		'desire hd':								[ STRINGS_HTC, 'Desire HD' ],
-		'Desire HD':								[ STRINGS_HTC, 'Desire HD' ],
-		'Dedire HD':								[ STRINGS_HTC, 'Desire HD' ],
-		'Desire Hd (ace)':							[ STRINGS_HTC, 'Desire HD' ],
-		'Desire S':									[ STRINGS_HTC, 'Desire S' ],
-		'DesireS':									[ STRINGS_HTC, 'Desire S' ],
-		'Desire Saga':								[ STRINGS_HTC, 'Desire S' ],
-		'Desire Z':									[ STRINGS_HTC, 'Desire Z' ],
-		'Dream':									[ STRINGS_HTC, 'Dream' ],
-		'Droid Incredible':							[ STRINGS_HTC, 'Droid Incredible' ],
-		'EVO':										[ STRINGS_HTC, 'EVO' ],
-		'Evo HD2':									[ STRINGS_HTC, 'EVO HD' ],
-		'Evo 3D Beats X515m':						[ STRINGS_HTC, 'EVO 3D' ],
-		'Evo 3D GSM':								[ STRINGS_HTC, 'EVO 3D' ],
-		'EVO 3D X515m':								[ STRINGS_HTC, 'EVO 3D' ],
-		'EVO3D X515m':								[ STRINGS_HTC, 'EVO 3D' ],
-		'Evo 4G':									[ STRINGS_HTC, 'EVO 4G' ],
-		'EVO 4G':									[ STRINGS_HTC, 'EVO 4G' ],
-		'photon':									[ STRINGS_HTC, 'HD mini' ],
-		'GinDream/GinMagic':						[ STRINGS_HTC, 'Dream' ],
-		'HD2':										[ STRINGS_HTC, 'HD2' ],
-		'HD7  Pro':									[ STRINGS_HTC, 'HD7 Pro' ],
-		'Hero':										[ STRINGS_HTC, 'Hero' ],
-		'HERO CDMA':								[ STRINGS_HTC, 'Hero' ],
-		'HERO200':									[ STRINGS_HTC, 'Hero 200' ],
-		'Incredible':								[ STRINGS_HTC, 'Droid Incredible' ],	/* Verizon */
-		'Incredible 2':								[ STRINGS_HTC, 'Droid Incredible 2' ],	/* Verizon */
-		'Incredible S':								[ STRINGS_HTC, 'Incredible S' ],
-		'IncredibleS S710e':						[ STRINGS_HTC, 'Incredible S' ],
-		'IncredibleS':								[ STRINGS_HTC, 'Incredible S' ],
-		'Inspire HD':								[ STRINGS_HTC, 'Inspire 4G' ],
-		'Inspire 4G':								[ STRINGS_HTC, 'Inspire 4G' ],
-		'Legend':									[ STRINGS_HTC, 'Legend' ],
-		'NexusHD2':									[ STRINGS_HTC, 'HD2' ],
-		'Nexus HD2':								[ STRINGS_HTC, 'HD2' ],
-		'Docomo HT-03A':							[ STRINGS_HTC, 'Magic' ],
-		'MIUI.us Sensation 4G':						[ STRINGS_HTC, 'Sensation 4G' ],
-		'SiRF Dream':								[ STRINGS_HTC, 'Dream' ],
-		'Pyramid':									[ STRINGS_HTC, 'Sensation' ],
-		'Sensation':								[ STRINGS_HTC, 'Sensation' ],
-		'Sensation Z710e':							[ STRINGS_HTC, 'Sensation' ],
-		'Sensation 4G':								[ STRINGS_HTC, 'Sensation' ],
-		'Sensation 4g':								[ STRINGS_HTC, 'Sensation' ],
-		'TripNiCE Pyramid':							[ STRINGS_HTC, 'Sensation' ],
-		'SensationXE Beats Z715e':					[ STRINGS_HTC, 'Sensation XE' ],
-		'SensationXL Beats X315e':					[ STRINGS_HTC, 'Sensation XL' ],
-		'Click':									[ STRINGS_HTC, 'Tattoo' ],
-		'Wildfire':									[ STRINGS_HTC, 'Wildfire' ],
-		'Wildfire S':								[ STRINGS_HTC, 'Wildfire S' ],
-		'Wildfire S A510e':							[ STRINGS_HTC, 'Wildfire S' ],
-		'Sprint APX515CKT':							[ STRINGS_HTC, 'EVO 3D' ],
-		'Sprint APA9292KT':							[ STRINGS_HTC, 'EVO 4G' ],
-		'Sprint APA7373KT':							[ STRINGS_HTC, 'EVO Shift 4G' ],
-		'Sprint APC715CKT':							[ STRINGS_HTC, 'EVO Design 4G' ],
-		'A3380':									[ STRINGS_HTC, 'Wildfire' ],
-		'A6277':									[ STRINGS_HTC, 'Hero' ],
-		'a7272':									[ STRINGS_HTC, 'Desire Z' ],					
-		'A7272+(HTC DesireZ)':						[ STRINGS_HTC, 'Desire Z' ],					
-		'S31HT':									[ STRINGS_HTC, 'Aria' ],
-		'S710d':									[ STRINGS_HTC, 'Droid Incredible 2' ],
-		'S710D':									[ STRINGS_HTC, 'Droid Incredible 2' ],
-		'X06HT':									[ STRINGS_HTC, 'Desire' ],
-		'001HT':									[ STRINGS_HTC, 'Desire HD' ],
-		'X325a':									[ STRINGS_HTC, 'One X' ],
-		'Z520m':									[ STRINGS_HTC, 'One S' ],
-		'Z710':										[ STRINGS_HTC, 'Sensation' ],
-		'Z710e':									[ STRINGS_HTC, 'Sensation' ],
-		'T9199h':									[ STRINGS_HTC, 'T9199h' ],
-		'HTC S610d':								[ STRINGS_HTC, 'S610d' ],
-		'ADR6200':									[ STRINGS_HTC, 'Droid Eris' ],
-		'ADR6300':									[ STRINGS_HTC, 'Droid Incredible' ],
-		'ADR6325VW':								[ STRINGS_HTC, 'Merge' ],	
-		'ADR6330VW':								[ STRINGS_HTC, 'Rhyme' ],	
-		'ADR6350':									[ STRINGS_HTC, 'Droid Incredible 2' ],
-		'ADR6400L':									[ STRINGS_HTC, 'Thunderbolt 4G' ],
-		'ADR6400L 4G':								[ STRINGS_HTC, 'Thunderbolt 4G' ],
-		'ADR6410LVW 4G':							[ STRINGS_HTC, 'Fireball' ],
-		'ADR6425LVW':								[ STRINGS_HTC, 'Rezound' ],
-		'ADR6425LVW 4G':							[ STRINGS_HTC, 'Rezound' ],					/* Verizon */
-		'Coquettish Red':							[ STRINGS_HTC, 'Rezound' ],
-		'PB99400':									[ STRINGS_HTC, 'Droid Incredible' ],	
-		'pcdadr6350':								[ STRINGS_HTC, 'Droid Incredible 2' ],
-		'PC36100':									[ STRINGS_HTC, 'EVO 4G' ],
-		'PG06100':									[ STRINGS_HTC, 'EVO Shift 4G' ],
-		'PG41200':									[ STRINGS_HTC, 'EVO View 4G', 'tablet' ],
-		'PG86100':									[ STRINGS_HTC, 'EVO 3D' ],
-		'PG8610000':								[ STRINGS_HTC, 'EVO 3D' ],
-		'PH44100':									[ STRINGS_HTC, 'EVO Design 4G' ],
-		'PJ83100':									[ STRINGS_HTC, 'One X' ],
-		'ISW11HT':									[ STRINGS_HTC, 'EVO 4G' ],
-		'ISW12HT':									[ STRINGS_HTC, 'EVO 3D' ],
-		'ISW13HT':									[ STRINGS_HTC, 'J' ],
-		'USCCADR6275US Carrier ID 45':				[ STRINGS_HTC, 'Desire' ],
-		'USCCADR6285US':							[ STRINGS_HTC, 'Hero S' ],
-		'USCCADR6325US Carrier ID 45':				[ STRINGS_HTC, 'Merge' ],
-		'MediaPad':									[ STRINGS_HUAWEI, 'MediaPad', 'tablet' ],
-		'Huawei MediaPad':							[ STRINGS_HUAWEI, 'MediaPad', 'tablet' ],
-		'HUAWEI MediaPad':							[ STRINGS_HUAWEI, 'MediaPad', 'tablet' ],
-		'Huawei S7-312u':							[ STRINGS_HUAWEI, 'MediaPad', 'tablet' ],
-		'MediaPad 7 Lite':							[ STRINGS_HUAWEI, 'MediaPad 7 Lite', 'tablet' ],
-		'MediaPad 10 FHD':							[ STRINGS_HUAWEI, 'MediaPad 10', 'tablet' ],
-		'Huawei C8500':								[ STRINGS_HUAWEI, 'C8500' ],
-		'Huawei C8500S':							[ STRINGS_HUAWEI, 'C8500' ],
-		'Huawei C8600':								[ STRINGS_HUAWEI, 'C8600' ],
-		'Huawei C8650':								[ STRINGS_HUAWEI, 'C8650' ],
-		'Huawei C8650+':							[ STRINGS_HUAWEI, 'C8650' ],
-		'Huawei C8800':								[ STRINGS_HUAWEI, 'IDEOS X5' ],
-		'Huawei C8810':								[ STRINGS_HUAWEI, 'Ascend G300' ],
-		'Huawei C8812':								[ STRINGS_HUAWEI, 'Ascend C8812' ],
-		'Huawei C8825D':							[ STRINGS_HUAWEI, 'Ascend G330C' ],
-		'Huawei C8860E':							[ STRINGS_HUAWEI, 'Honor' ],
-		'Huawei G300':								[ STRINGS_HUAWEI, 'Ascend G300' ],
-		'Huawei M835':								[ STRINGS_HUAWEI, 'M835' ],
-		'Huawei M860':								[ STRINGS_HUAWEI, 'Ascend' ],
-		'Huawei M920':								[ STRINGS_HUAWEI, 'M920' ],
-		'Huawei M921':								[ STRINGS_HUAWEI, 'M921' ],
-		'Huawei M931':								[ STRINGS_HUAWEI, 'M931' ],
-		'Huawei S8520':								[ STRINGS_HUAWEI, 'S8520' ],
-		'Huawei S8600':								[ STRINGS_HUAWEI, 'S8600' ],
-		'Huawei T8300':								[ STRINGS_HUAWEI, 'T8300' ],
-		'Huawei T8600':								[ STRINGS_HUAWEI, 'T8600' ],
-		'Huawei T8950':								[ STRINGS_HUAWEI, 'Honor+' ],
-		'Huawei U8220':								[ STRINGS_HUAWEI, 'U8220' ],
-		'Huawei u8500':								[ STRINGS_HUAWEI, 'IDEOS X2' ],
-		'Huawei U8815':								[ STRINGS_HUAWEI, 'Ascend G300' ],
-		'Huawei U8850':								[ STRINGS_HUAWEI, 'Vision' ],
-		'Huawei U8652':								[ STRINGS_HUAWEI, 'Sonic' ],
-		'Huawei U8661':								[ STRINGS_HUAWEI, 'Sonic+' ],
-		'Huawei U8800-51':							[ STRINGS_HUAWEI, 'IDEOS X5' ],
-		'Huawei U8818':								[ STRINGS_HUAWEI, 'Ascend G300' ],
-		'Huawei U8825D':							[ STRINGS_HUAWEI, 'Ascend G330D' ],
-		'Huawei U9000':								[ STRINGS_HUAWEI, 'Ascend X' ],
-		'Huawei IDEOS U8500':						[ STRINGS_HUAWEI, 'IDEOS X2' ],
-		'Huawei IDEOS U8650':						[ STRINGS_HUAWEI, 'Sonic' ],
-		'Huawei IDEOS X3':							[ STRINGS_HUAWEI, 'IDEOS X3' ],
-		'Huawei Ideos X5':							[ STRINGS_HUAWEI, 'IDEOS X5' ],
-		'Huawei Ideos X5 1.12.9(ret4rt)':			[ STRINGS_HUAWEI, 'IDEOS X5' ],
-		'Huawei SONIC':								[ STRINGS_HUAWEI, 'Sonic' ],
-		'Huawei 8100-9':							[ STRINGS_HUAWEI, 'U8100' ],
-		'FUSIONideos':								[ STRINGS_HUAWEI, 'IDEOS' ],
-		'Gnappo Ideos':								[ STRINGS_HUAWEI, 'IDEOS' ],
-		'Ideos':									[ STRINGS_HUAWEI, 'IDEOS' ],
-		'IDEOS X5':									[ STRINGS_HUAWEI, 'IDEOS X5' ],
-		'Ideos S7':									[ STRINGS_HUAWEI, 'IDEOS S7', 'tablet' ],
-		'IDEOS S7':									[ STRINGS_HUAWEI, 'IDEOS S7', 'tablet' ],
-		'IDEOS S7 Slim':							[ STRINGS_HUAWEI, 'IDEOS S7', 'tablet' ],
-		'Huawei S7':								[ STRINGS_HUAWEI, 'IDEOS S7', 'tablet' ],
-		'SONIC':									[ STRINGS_HUAWEI, 'Sonic' ],
-		'Kyivstar Aqua':							[ STRINGS_HUAWEI, 'Sonic' ],
-		'Lucky Ultra Sonic U8650':					[ STRINGS_HUAWEI, 'Sonic' ],
-		'Turkcell T20':								[ STRINGS_HUAWEI, 'Sonic' ],
-		'MTC 950':									[ STRINGS_HUAWEI, 'U8160' ],
-		'MTC 955':									[ STRINGS_HUAWEI, 'Sonic' ],
-		'MTC Evo':									[ STRINGS_HUAWEI, 'C8500' ],
-		'MTC Android':								[ STRINGS_HUAWEI, 'U8110' ],
-		'S31HW':									[ STRINGS_HUAWEI, 'Pocket WiFi S' ],
-		'S41HW':									[ STRINGS_HUAWEI, 'Pocket WiFi S II' ],
-		'007HW':									[ STRINGS_HUAWEI, 'Vision' ],	
-		'UM840':									[ STRINGS_HUAWEI, 'Evolution' ],	
-		'M860':										[ STRINGS_HUAWEI, 'Ascend' ],
-		'M865':										[ STRINGS_HUAWEI, 'Ascend II' ],
-		'M886':										[ STRINGS_HUAWEI, 'Glory' ],
-		'C8150':									[ STRINGS_HUAWEI, 'IDEOS' ],
-		'c8500':									[ STRINGS_HUAWEI, 'C8500' ],
-		'C8500':									[ STRINGS_HUAWEI, 'C8500' ],
-		'C8500S':									[ STRINGS_HUAWEI, 'C8500' ],
-		'C8600':									[ STRINGS_HUAWEI, 'C8600' ],
-		'c8650':									[ STRINGS_HUAWEI, 'C8650' ],
-		'C8650':									[ STRINGS_HUAWEI, 'C8650' ],
-		'c8800':									[ STRINGS_HUAWEI, 'C8800' ],
-		'C8800':									[ STRINGS_HUAWEI, 'C8800' ],
-		'c8810':									[ STRINGS_HUAWEI, 'Ascend G300C' ],
-		'C8812':									[ STRINGS_HUAWEI, 'Ascend C8812' ],
-		'S8600':									[ STRINGS_HUAWEI, 'S8600' ],
-		'U8100':									[ STRINGS_HUAWEI, 'U8100' ],
-		'U8110':									[ STRINGS_HUAWEI, 'U8110' ],
-		'u8120':									[ STRINGS_HUAWEI, 'U8120' ],
-		'U8120':									[ STRINGS_HUAWEI, 'U8120' ],
-		'U8180':									[ STRINGS_HUAWEI, 'IDEOS X1' ],
-		'U8220':									[ STRINGS_HUAWEI, 'Pulse' ],
-		'U8300':									[ STRINGS_HUAWEI, 'U8300' ],
-		'U8350':									[ STRINGS_HUAWEI, 'Boulder' ],
-		'U8150':									[ STRINGS_HUAWEI, 'IDEOS' ],
-		'U8160':									[ STRINGS_HUAWEI, 'U8160' ],
-		'U8180':									[ STRINGS_HUAWEI, 'IDEOS X1' ],
-		'U8500':									[ STRINGS_HUAWEI, 'IDEOS X2' ],
-		'U8500 HiQQ':								[ STRINGS_HUAWEI, 'U8500 HiQQ Edition' ],
-		'U8510':									[ STRINGS_HUAWEI, 'IDEOS X3' ],
-		'u8650':									[ STRINGS_HUAWEI, 'Sonic' ],
-		'U8650':									[ STRINGS_HUAWEI, 'Sonic' ],
-		'U8650-1':									[ STRINGS_HUAWEI, 'Sonic' ],
-		'U8660':									[ STRINGS_HUAWEI, 'Sonic' ],
-		'u8800':									[ STRINGS_HUAWEI, 'IDEOS X5' ],
-		'U8800':									[ STRINGS_HUAWEI, 'IDEOS X5' ],
-		'U8800+':									[ STRINGS_HUAWEI, 'IDEOS X5' ],
-		'U8800X':									[ STRINGS_HUAWEI, 'IDEOS X5' ],
-		'U8800pro':									[ STRINGS_HUAWEI, 'IDEOS X5 Pro' ],
-		'U8800PRO':									[ STRINGS_HUAWEI, 'IDEOS X5 Pro' ],
-		'U8800Pro':									[ STRINGS_HUAWEI, 'IDEOS X5 Pro' ],
-		'u8800pro':									[ STRINGS_HUAWEI, 'IDEOS X5 Pro' ],
-		'U8800 Pro':								[ STRINGS_HUAWEI, 'IDEOS X5 Pro' ],
-		'U8815':									[ STRINGS_HUAWEI, 'Ascend G300' ],
-		'U8818':									[ STRINGS_HUAWEI, 'Ascend G300' ],
-		'U8820':									[ STRINGS_HUAWEI, 'Titan' ],
-		'U8850':									[ STRINGS_HUAWEI, 'Vision' ],
-		'u8860':									[ STRINGS_HUAWEI, 'Honor' ],
-		'U8860':									[ STRINGS_HUAWEI, 'Honor' ],
-		'U9000':									[ STRINGS_HUAWEI, 'Ascend X' ],
-		'U9200':									[ STRINGS_HUAWEI, 'Ascend P1' ],
-		'U9200-1':									[ STRINGS_HUAWEI, 'Ascend P1' ],
-		'U9200E':									[ STRINGS_HUAWEI, 'Ascend P1' ],
-		'U9500':									[ STRINGS_HUAWEI, 'Ascend D1' ],
-		'U9501L':									[ STRINGS_HUAWEI, 'Ascend D LTE' ],
-		'U9510':									[ STRINGS_HUAWEI, 'Ascend D quad' ],
-		'U9510E':									[ STRINGS_HUAWEI, 'Ascend D quad' ],
-		'Comet':									[ STRINGS_HUAWEI, 'Comet' ],
-		'GS02':										[ STRINGS_HUAWEI, 'Honor' ],
-		'GS03':										[ STRINGS_HUAWEI, 'Ascend P1' ],
-		'DroniX-0.5':								[ STRINGS_HUAWEI, 'U8180' ],
-		'MTS-SP101':								[ STRINGS_HUAWEI, 'C8511' ],
-		'TSP21':									[ STRINGS_HUAWEI, 'U8110' ],
-		'HW-01E':									[ STRINGS_HUAWEI, 'Ascend HW-01E' ],								
-		'HYUNDAI H6':								[ 'Hyundai', 'Storm H6' ],
-		'iBall Slide i7011':						[ 'iBall', 'Slide i7011' ],
-		'NetTAB RUNE':								[ 'IconBit', 'NetTab Rune', 'tablet' ],
-		'D70W':										[ 'Icoo', 'D70W', 'tablet' ],
-		'D80':										[ 'Icoo', 'D80', 'tablet' ],
-		'INFOBAR A01':								[ 'iida', 'INFOBAR A01' ],
-		'M009F':									[ 'Infotmic', 'M009F' ],
-		'AZ210A':									[ 'Intel', 'AZ210A' ],
-		'AZ210B':									[ 'Intel', 'AZ210B' ],
-		'AZ510':									[ 'Intel', 'AZ510' ],
-		'greenridge':								[ 'Intel', 'Green Ridge', 'tablet' ],
-		'INQ Cloud Touch':							[ 'INQ', 'Cloud Touch' ],
-		'ILT-MX100':								[ 'iRiver', 'Tab', 'tablet' ],
-		'IVIO_DE38':								[ 'Ivio', 'DE38' ],
-		'JY-G2':									[ 'Jiayu', 'G2' ],
-		'JXD S601WIFI':								[ 'JXD', 'S601 WIFI', 'media' ],
-		'A2':										[ 'KakaTech', 'A2' ],
-		'D91':										[ 'KK', 'D91', 'tablet' ],
-		'K080':										[ 'Kobo', 'K080', 'ereader' ],
-		'A106':										[ 'koobee', 'A160' ],
-		'KPT A9':									[ 'KPT', 'A9' ],
-		'EV-S100':									[ 'Kttech', 'Take EV-S100' ],
-		'KM-S120':									[ 'Kttech', 'Take 2 KM-S120' ],
-		'KM-S200':									[ 'Kttech', 'Take Janus KM-S200' ],
-		'KM-S220':									[ 'Kttech', 'Take Tachy KM-S220' ],
-		'Kyobo mirasol eReader':					[ 'Kyobo', 'eReader', 'ereader' ],
-		'ISW11K':									[ 'Kyocera', 'Digno' ],
-		'JC-KSP8000':								[ 'Kyocera', 'Echo' ],
-		'KSP8000':									[ 'Kyocera', 'Echo' ],
-		'Zio':										[ 'Kyocera', 'Zio' ],
-		'C5155':									[ 'Kyocera', 'C5155' ],
-		'C5170':									[ 'Kyocera', 'C5170' ],
-		'M9300':									[ 'Kyocera', 'M9300' ],
-		'K-Touch E619':								[ 'K-Touch', 'E619' ],
-		'E800':										[ 'K-Touch', 'E800' ],
-		'W606':										[ 'K-Touch', 'W606' ],
-		'K-Touch W619':								[ 'K-Touch', 'W619' ],
-		'K-Touch W650':								[ 'K-Touch', 'W650' ],
-		'W700':										[ 'K-Touch', 'W700' ],
-		'W800':										[ 'K-Touch', 'W800' ],
-		'W806':										[ 'K-Touch', 'W806' ],
-		'W808':										[ 'K-Touch', 'W808' ],
-		'W810':										[ 'K-Touch', 'W810' ],
-		'X900':										[ 'Lava', 'XOLO X900' ],
-		'ThinkPad Tablet':							[ STRINGS_LENOVO, 'ThinkPad Tablet', 'tablet' ],
-		'K1':										[ STRINGS_LENOVO, 'IdeaPad K1', 'tablet' ],
-		'Ideapad S10-3T':							[ STRINGS_LENOVO, 'IdeaPad S10-3T', 'tablet' ],
-		'S2005A-H':									[ STRINGS_LENOVO, 'S2005A' ],
-		'IdeaTab S2007A-D':							[ STRINGS_LENOVO, 'IdeaTab S2007A', 'tablet' ],
-		'IdeaTabV2007A':							[ STRINGS_LENOVO, 'IdeaTab V2007A', 'tablet' ],
-		'IdeaTabV2007A-D-I':						[ STRINGS_LENOVO, 'IdeaTab V2007A', 'tablet' ],
-		'IdeaTabV2010A':							[ STRINGS_LENOVO, 'IdeaTab V2010A', 'tablet' ],
-		'IdeaTab A2107A-H':							[ STRINGS_LENOVO, 'IdeaTab V2107A', 'tablet' ],
-		'A1 07':									[ STRINGS_LENOVO, 'LePad', 'tablet' ],
-		'lepad 001b':								[ STRINGS_LENOVO, 'LePad', 'tablet' ],
-		'lepad 001n':								[ STRINGS_LENOVO, 'LePad', 'tablet' ],
-		'3GC101':									[ STRINGS_LENOVO, 'LePhone 3GC101' ],
-		'Lenovo 3GC101':							[ STRINGS_LENOVO, 'LePhone 3GC101' ],
-		'3GW100':									[ STRINGS_LENOVO, 'LePhone 3GW100' ],
-		'Lenovo 3GW100':							[ STRINGS_LENOVO, 'LePhone 3GW100' ],
-		'3GW101':									[ STRINGS_LENOVO, 'LePhone 3GW101' ],
-		'Lenovo 3GW101':							[ STRINGS_LENOVO, 'LePhone 3GW101' ],
-		'Lephone 3GW101':							[ STRINGS_LENOVO, 'LePhone 3GW101' ],
-		'Lenovo A1-32AB0':							[ STRINGS_LENOVO, 'LePhone A1-32AB0' ],
-		'Lenovo S1-37AH0':							[ STRINGS_LENOVO, 'LePhone S1-37AH0' ],
-		'S1 37AHO':									[ STRINGS_LENOVO, 'LePhone S1-37AH0' ],
-		'Lenovo S2-38AH0':							[ STRINGS_LENOVO, 'LePhone S2-38AH0' ],
-		'Lenovo S2-38AT0':							[ STRINGS_LENOVO, 'LePhone S2-38AT0' ],
-		'Lenovo A288t':								[ STRINGS_LENOVO, 'LePhone A288' ],
-		'Lenovo A300':								[ STRINGS_LENOVO, 'LePhone A300' ],
-		'Lenovo A366t':								[ STRINGS_LENOVO, 'LePhone A366' ],
-		'Lenovo A390e':								[ STRINGS_LENOVO, 'LePhone A390' ],
-		'Lenovo A500':								[ STRINGS_LENOVO, 'LePhone A500' ],
-		'Lenovo A520':								[ STRINGS_LENOVO, 'LePhone A520' ],
-		'Lenovo A520GRAY':							[ STRINGS_LENOVO, 'LePhone A520' ],
-		'Lenovo A668t':								[ STRINGS_LENOVO, 'LePhone A668' ],
-		'Lenovo A698t':								[ STRINGS_LENOVO, 'LePhone A698' ],
-		'Lenovo A750':								[ STRINGS_LENOVO, 'LePhone A750' ],
-		'Lenovo A780':								[ STRINGS_LENOVO, 'LePhone A780' ],
-		'Lenovo A789':								[ STRINGS_LENOVO, 'LePhone A789' ],
-		'Lenovo A790e':								[ STRINGS_LENOVO, 'LePhone A790' ],
-		'Lenovo K860':								[ STRINGS_LENOVO, 'LePhone K860' ],
-		'Lenovo P70':								[ STRINGS_LENOVO, 'LePhone P70' ],
-		'Lenovo P700':								[ STRINGS_LENOVO, 'LePhone P700' ],
-		'Lenovo S560':								[ STRINGS_LENOVO, 'S560' ],
-		'Lenovo S850e':								[ STRINGS_LENOVO, 'S850' ],
-		'Lenovo S880':								[ STRINGS_LENOVO, 'S880' ],
-		'A30t':										[ STRINGS_LENOVO, 'A30t' ],
-		'Lenovo A60':								[ STRINGS_LENOVO, 'A60' ],
-		'Lenovo A60+':								[ STRINGS_LENOVO, 'A60' ],
-		'Lenovo A65':								[ STRINGS_LENOVO, 'A65' ],
-		'Lenovo A66t':								[ STRINGS_LENOVO, 'A66t' ],
-		'Lenovo A68e':								[ STRINGS_LENOVO, 'A68e' ],
-		'Lenovo K800':								[ STRINGS_LENOVO, 'K800' ],
-		'IDEA TV T100':								[ STRINGS_LENOVO, 'IDEA TV', 'television' ],
-		'IDEA TV K91':								[ STRINGS_LENOVO, 'IDEA TV', 'television' ],
-		'TC970':									[ 'Le Pan', 'TC970', 'tablet' ],
-		'LePanII':									[ 'Le Pan', 'II', 'tablet' ],
-		'LG-C555':									[ STRINGS_LG, 'Optimus Chat' ],
-		'LG-C555-parrot':							[ STRINGS_LG, 'Optimus Chat' ],
-		'LG-C660':									[ STRINGS_LG, 'Optimus Pro' ],
-		'LG-C660h':									[ STRINGS_LG, 'Optimus Pro' ],
-		'LG-C729':									[ STRINGS_LG, 'DoublePlay' ],
-		'LG-C800G':									[ STRINGS_LG, 'Eclypse' ],
-		'LG-CX670':									[ STRINGS_LG, 'Optimus 3G' ],
-		'LG-E400':									[ STRINGS_LG, 'Optimus L3' ],
-		'LG-E400f':									[ STRINGS_LG, 'Optimus L3' ],
-		'LG-E405':									[ STRINGS_LG, 'Optimus L3 Dual' ],
-		'LG-E405f':									[ STRINGS_LG, 'Optimus L3 Dual' ],
-		'LG-E510':									[ STRINGS_LG, 'Optimus Hub' ],
-		'LG-E510f':									[ STRINGS_LG, 'Optimus Hub' ],
-		'LG-E510g':									[ STRINGS_LG, 'Optimus Hub' ],
-		'LG-E610':									[ STRINGS_LG, 'Optimus L5' ],
-		'LG-E612':									[ STRINGS_LG, 'Optimus L5' ],
-		'LG-E612g':									[ STRINGS_LG, 'Optimus L5' ],
-		'LG-E615F':									[ STRINGS_LG, 'E615' ],
-		'LG-E617G':									[ STRINGS_LG, 'E617' ],
-		'LG-E720':									[ STRINGS_LG, 'Optimus Chic' ],
-		'LG-E720b':									[ STRINGS_LG, 'Optimus Chic' ],
-		'LG-E730':									[ STRINGS_LG, 'Optimus Sol' ],
-		'LG-E970':									[ STRINGS_LG, 'Shine' ],
-		'LG-F100L':									[ STRINGS_LG, 'Optimus Vu' ],
-		'LG-F100S':									[ STRINGS_LG, 'Optimus Vu' ],
-		'LG-F120K':									[ STRINGS_LG, 'Optimus LTE Tag' ],
-		'LG-F120L':									[ STRINGS_LG, 'Optimus LTE Tag' ],
-		'LG-F120S':									[ STRINGS_LG, 'Optimus LTE Tag' ],
-		'LG-F160':									[ STRINGS_LG, 'Optimus LTE II' ],
-		'LG-F160K':									[ STRINGS_LG, 'Optimus LTE II' ],
-		'LG-F160L':									[ STRINGS_LG, 'Optimus LTE II' ],
-		'LG-F160S':									[ STRINGS_LG, 'Optimus LTE II' ],
-		'LG-F180L':									[ STRINGS_LG, 'Optimus G' ],
-		'LG-F180S':									[ STRINGS_LG, 'Optimus G' ],
-		'LG-GT540':									[ STRINGS_LG, 'Optimus' ],
-		'LG-GT540f':								[ STRINGS_LG, 'Optimus' ],
-		'LG-GT540 Swift':							[ STRINGS_LG, 'Optimus' ],
-		'LG-GW620':									[ STRINGS_LG, 'GW620' ],
-		'LG-KH5200':								[ STRINGS_LG, 'Andro-1' ],
-		'LG-KU3700':								[ STRINGS_LG, 'Optimus One' ],
-		'LG-KU5400':								[ STRINGS_LG, 'PRADA 3.0' ],
-		'LG-KU5900':								[ STRINGS_LG, 'Optimus Black' ],
-		'LG-L40G':									[ STRINGS_LG, 'L40G' ],
-		'LG-LG855':									[ STRINGS_LG, 'Marquee' ],
-		'LG-LS670':									[ STRINGS_LG, 'Optimus S' ],
-		'LG-LS696':									[ STRINGS_LG, 'Optimus Elite' ],
-		'LG-LS840':									[ STRINGS_LG, 'Viper 4G' ],
-		'LG-LS855':									[ STRINGS_LG, 'Marquee' ],
-		'LG-LS860':									[ STRINGS_LG, '"Cayenne"' ],
-		'LG-LS970':									[ STRINGS_LG, '"Eclipse"' ],
-		'LG-LU3000':								[ STRINGS_LG, 'Optimus Mach' ],
-		'LG-LU3100':								[ STRINGS_LG, 'Optimus Chic' ],
-		'LG-LU3700':								[ STRINGS_LG, 'Optimus One' ],
-		'LG-LU5400':								[ STRINGS_LG, 'PRADA 3.0' ],
-		'LG-LU6200':								[ STRINGS_LG, 'Optimus Q2' ],
-		'LG-lu6200':								[ STRINGS_LG, 'Optimus Q2' ],
-		'LG-LU6500':								[ STRINGS_LG, 'Optimus Note' ],
-		'LG-LU6800':								[ STRINGS_LG, 'Optimus Big' ],
-		'LG-LU8300':								[ STRINGS_LG, 'Optimus Pad LTE' ],
-		'LG-LW690':									[ STRINGS_LG, 'Optimus C' ],
-		'LG-LW770':									[ STRINGS_LG, 'LW770' ],
-		'LG-MS690':									[ STRINGS_LG, 'Optimus M' ],
-		'LG-MS770':									[ STRINGS_LG, 'MS770' ],
-		'LG-MS840':									[ STRINGS_LG, 'Connect 4G' ],
-		'LG-MS870':									[ STRINGS_LG, 'MS870' ],
-		'LG-MS910':									[ STRINGS_LG, 'Esteem' ],
-		'LG-MS695':									[ STRINGS_LG, 'Optimus M+' ],
-		'LG P350':									[ STRINGS_LG, 'Optimus Me' ],
-		'LG-P350':									[ STRINGS_LG, 'Optimus Me' ],
-		'LG-P350f':									[ STRINGS_LG, 'Optimus Me' ],
-		'LG-P350g':									[ STRINGS_LG, 'Optimus Me' ],
-		'LG-P355':									[ STRINGS_LG, 'P355' ],
-		'LG-P500':									[ STRINGS_LG, 'Optimus One' ],
-		'LG-P500h':									[ STRINGS_LG, 'Optimus One' ],
-		'LG-P500h-parrot':							[ STRINGS_LG, 'Optimus One' ],
-		'LG-P503':									[ STRINGS_LG, 'Optimus One' ],
-		'LG-P504':									[ STRINGS_LG, 'Optimus One' ],
-		'LG-P505':									[ STRINGS_LG, 'Phoenix' ],
-		'LG-P505R':									[ STRINGS_LG, 'Phoenix' ],
-		'LG-P506':									[ STRINGS_LG, 'Thrive' ],
-		'LG-P509':									[ STRINGS_LG, 'Optimus T' ],
-		'LG-P690':									[ STRINGS_LG, 'Optimus Net' ],
-		'LG-P693':									[ STRINGS_LG, 'P693' ],
-		'LG-P698':									[ STRINGS_LG, 'Optimus Net' ],
-		'LG-P698f':									[ STRINGS_LG, 'Optimus Net' ],
-		'LG-P700':									[ STRINGS_LG, 'Optimus L7' ],
-		'LG-P705':									[ STRINGS_LG, 'Optimus L7' ],
-		'LG-P705f':									[ STRINGS_LG, 'Optimus L7' ],
-		'LG-P705g':									[ STRINGS_LG, 'Optimus L7' ],
-		'LG-P708g':									[ STRINGS_LG, 'P708' ],
-		'LG-P720':									[ STRINGS_LG, 'Optimus Chic' ],
-		'LG-P720h':									[ STRINGS_LG, 'Optimus Chic' ],
-		'LG-P725':									[ STRINGS_LG, 'Optimus 3D Max' ],
-		'LG-P760':									[ STRINGS_LG, 'P760' ],
-		'LG-P769':									[ STRINGS_LG, 'P769' ],
-		'LG-P860':									[ STRINGS_LG, 'P860' ],
-		'LG-P870':									[ STRINGS_LG, 'P870' ],	
-		'LG-P870F':									[ STRINGS_LG, 'P870' ],	
-		'LG-P880':									[ STRINGS_LG, 'X3' ],
-		'LG-P880g':									[ STRINGS_LG, 'X3' ],
-		'LG-P895':									[ STRINGS_LG, 'P895' ],	
-		'LG-P920':									[ STRINGS_LG, 'Optimus 3D' ],
-		'LG-P920h':									[ STRINGS_LG, 'Optimus 3D' ],
-		'LG-P925':									[ STRINGS_LG, 'Thrill' ],
-		'LG-P925g':									[ STRINGS_LG, 'Thrill' ],
-		'LG-P930':									[ STRINGS_LG, 'Nitro HD' ],
-		'LG-P936':									[ STRINGS_LG, 'Optimus LTE' ],
-		'LG-P940':									[ STRINGS_LG, 'PRADA 3.0' ],
-		'LG-P970':									[ STRINGS_LG, 'Optimus Black' ],
-		'LG-P970g':									[ STRINGS_LG, 'Optimus Black' ],
-		'LG-P970h':									[ STRINGS_LG, 'Optimus Black' ],
-		'LG-P990':									[ STRINGS_LG, 'Optimus 2X Speed' ],
-		'LG-P990h':									[ STRINGS_LG, 'Optimus 2X Speed' ],
-		'LG-P990hN':								[ STRINGS_LG, 'Optimus 2X Speed' ],
-		'LG-P990H':									[ STRINGS_LG, 'Optimus 2X Speed' ],
-		'LG-P993':									[ STRINGS_LG, 'Optimus 2X' ],
-		'LG-SU540':									[ STRINGS_LG, 'PRADA 3.0' ],
-		'LG-SU640':									[ STRINGS_LG ,'Optimus LTE' ],
-		'LG-SU660':									[ STRINGS_LG, 'Optimus 2X' ],
-		'LG-SU760':									[ STRINGS_LG, 'Optimus 3D' ],
-		'LG-SU760-Kust':							[ STRINGS_LG, 'Optimus 3D' ],
-		'LG-SU870':									[ STRINGS_LG, 'Optimus 3D Cube' ],
-		'LG-SU880':									[ STRINGS_LG, 'Optimus EX' ],
-		'LG-US670':									[ STRINGS_LG, 'Optimus U' ],
-		'LG-US730':									[ STRINGS_LG, 'US730' ],
-		'LG-V900':									[ STRINGS_LG, 'Optimus Pad', 'tablet' ],
-		'LG-V905R':									[ STRINGS_LG, 'Optimus G-Slate', 'tablet' ],
-		'LG-V909':									[ STRINGS_LG, 'Optimus G-Slate', 'tablet' ],
-		'LG-VM670':									[ STRINGS_LG, 'Optimus V' ],
-		'LG-VM696':									[ STRINGS_LG, 'Optimus Elite' ],
-		'LG-VM701':									[ STRINGS_LG, 'Optimus Slider' ],
-		'LG-VS660':									[ STRINGS_LG, 'Vortex' ],
-		'LG-VS700':									[ STRINGS_LG, 'Enlighten' ],
-		'LG-VS740':									[ STRINGS_LG, 'Ally' ],
-		'LG-VS840':									[ STRINGS_LG, 'Connect 4G' ],
-		'LG-VS910':									[ STRINGS_LG, 'Revolution' ],
-		'lgp-970':									[ STRINGS_LG, 'Optimus Black' ],
-		'E900':										[ STRINGS_LG, 'Optimus 7' ],
-		'GT540':									[ STRINGS_LG, 'Optimus GT540' ],
-		'GW620':									[ STRINGS_LG, 'GW620' ],
-		'KU9500':									[ STRINGS_LG, 'Optimus Z' ],
-		'LGC660':									[ STRINGS_LG, 'Optimus Pro' ],
-		'LGL45C':									[ STRINGS_LG, 'Optimus Net' ],
-		'LGL55C':									[ STRINGS_LG, 'Optimus Q' ],
-		'LU2300':									[ STRINGS_LG, 'Optimus Q' ],	
-		'LS670':									[ STRINGS_LG, 'Optimus S' ],
-		'P940':										[ STRINGS_LG, 'PRADA 3.0' ],
-		'P990':										[ STRINGS_LG, 'Optimus 2X Speed' ],
-		'USCC-US730':								[ STRINGS_LG, 'US730' ],
-		'USCC-US760':								[ STRINGS_LG, 'Genesis' ],
-		'VM670':									[ STRINGS_LG, 'Optimus V' ],
-		'VS840 4G':									[ STRINGS_LG, 'Connect 4G' ],
-		'VS900-4G':									[ STRINGS_LG, 'VS900' ],
-		'VS910 4G':									[ STRINGS_LG, 'Revolution 4G' ],
-		'VS920 4G':									[ STRINGS_LG, 'Spectrum 4G' ],
-		'VS930 4G':									[ STRINGS_LG, 'VS930' ],
-		'VS950 4G':									[ STRINGS_LG, 'VS950' ],
-		'L-01D':									[ STRINGS_LG, 'Optimus LTE' ],
-		'L-02D':									[ STRINGS_LG, 'PRADA phone' ],
-		'L-04C':									[ STRINGS_LG, 'Optimus Chat' ],
-		'L-05D':									[ STRINGS_LG, 'Optimus it' ],
-		'L-06C':									[ STRINGS_LG, 'Optimus Pad', 'tablet' ],
-		'L-06D':									[ STRINGS_LG, 'Optimus Vu' ],
-		'L-07C':									[ STRINGS_LG, 'Optimus Bright' ],
-		'LG-Eve':									[ STRINGS_LG, 'Eve' ],
-		'LG-Optimus One P500':						[ STRINGS_LG, 'Optimus One' ],
-		'LG-Optimus 2X':							[ STRINGS_LG, 'Optimus 2X' ],
-		'LG-GT540 Optimus':							[ STRINGS_LG, 'Optimus' ],
-		'LG-Optimus Black':							[ STRINGS_LG, 'Optimus Black' ],
-		'Ally':										[ STRINGS_LG, 'Ally' ],
-		'Optimus':									[ STRINGS_LG, 'Optimus' ],
-		'Optimus Me':								[ STRINGS_LG, 'Optimus Me' ],
-		'optimus me p350':							[ STRINGS_LG, 'Optimus Me' ],
-		'Optimus 2X':								[ STRINGS_LG, 'Optimus 2X' ],
-		'Optimus 2x':								[ STRINGS_LG, 'Optimus 2X' ],
-		'IS11LG':									[ STRINGS_LG, 'Optimus X' ],
-		'Vortex':									[ STRINGS_LG, 'Vortex' ],
-		'LDK-ICK v1.4':								[ STRINGS_LG, 'Esteem' ],
-		'T6':										[ 'Malata', 'Zpad T6', 'tablet' ],
-		'Malata SMBA1002':							[ 'Malata', 'Tablet SMB-A1002', 'tablet' ],
-		'STM712HCZ':								[ 'Mediacom', 'SmartPad 712c', 'tablet' ],
-		'STM803HC':									[ 'Mediacom', 'SmartPad 810c', 'tablet' ],
-		'Mediacom 810C':							[ 'Mediacom', 'SmartPad 810c', 'tablet' ],
-		'Smartpad810c':								[ 'Mediacom', 'SmartPad 810c', 'tablet' ],
-		'SmartPad810c':								[ 'Mediacom', 'SmartPad 810c', 'tablet' ],
-		'MP810C':									[ 'Mediacom', 'SmartPad 810c', 'tablet' ],
-		'MP907C':									[ 'Mediacom', 'SmartPad 907c', 'tablet' ],
-		'MTK6516':									[ 'Mediatek', 'MTK6516' ],
-		'LIFETAB S9512':							[ 'Medion', 'Lifetab S9512', 'tablet' ],
-		'LIFETAB P9514':							[ 'Medion', 'Lifetab P9514', 'tablet' ],
-		'MD LIFETAB P9516':							[ 'Medion', 'Lifetab P9516', 'tablet' ],
-		'MEDION LIFE P4310':						[ 'Medion', 'Life P4310' ],
-		'M8':										[ 'Meizu', 'M8' ],
-		'M9':										[ 'Meizu', 'M9' ],
-		'M9-unlocked':								[ 'Meizu', 'M9' ],
-		'meizu m9':									[ 'Meizu', 'M9' ],
-		'MEIZU M9':									[ 'Meizu', 'M9' ],
-		'MEIZU MX':									[ 'Meizu', 'MX' ],
-		'M030':										[ 'Meizu', 'MX M030' ],
-		'M031':										[ 'Meizu', 'MX M031' ],
-		'M032':										[ 'Meizu', 'MX M032' ],
-		'Slidepad':									[ 'Memup', 'Slidepad', 'tablet' ],
-		'A45':										[ 'Micromax', 'A45 Punk' ],
-		'Micromax A50':								[ 'Micromax', 'A50 Ninja' ],
-		'Micromax A57':								[ 'Micromax', 'A57 Ninja 3' ],
-		'Micromax A60':								[ 'Micromax', 'Andro A60' ],
-		'Micromax A70':								[ 'Micromax', 'Andro A70' ],
-		'Micromax A87':								[ 'Micromax', 'A87 Ninja 4' ],
-		'Micromax A90':								[ 'Micromax', 'A90 Superfone' ],
-		'P300(Funbook)':							[ 'Micromax', 'Funbook P300', 'tablet' ],
-		'AT735':									[ 'Moinstone', 'AT735', 'tablet' ],
-		'A853':										[ STRINGS_MOTOROLA, 'Milestone' ],
-		'A953':										[ STRINGS_MOTOROLA, 'Milestone 2' ],
-		'A1680':									[ STRINGS_MOTOROLA, 'MOTO A1680' ],
-		'ET1':										[ STRINGS_MOTOROLA, 'ET1 Enterprise Tablet', 'tablet' ],
-		'MB200':									[ STRINGS_MOTOROLA, 'CLIQ' ],
-		'MB300':									[ STRINGS_MOTOROLA, 'BACKFLIP' ],
-		'MB501':									[ STRINGS_MOTOROLA, 'CLIQ XT' ],
-		'MB502':									[ STRINGS_MOTOROLA, 'CHARM' ],
-		'MB511':									[ STRINGS_MOTOROLA, 'FLIPOUT' ],
-		'MB520':									[ STRINGS_MOTOROLA, 'BRAVO' ],
-		'MB525':									[ STRINGS_MOTOROLA, 'DEFY' ],
-		'MB525+':									[ STRINGS_MOTOROLA, 'DEFY' ],
-		'MB525 for me':								[ STRINGS_MOTOROLA, 'DEFY' ],
-		'MB526':									[ STRINGS_MOTOROLA, 'DEFY+' ],
-		'MB611':									[ STRINGS_MOTOROLA, 'CLIQ 2' ],
-		'MB612':									[ STRINGS_MOTOROLA, 'XPRT' ],
-		'MB632':									[ STRINGS_MOTOROLA, 'PRO+' ],
-		'MB855':									[ STRINGS_MOTOROLA, 'PHOTON 4G' ],
-		'MB860':									[ STRINGS_MOTOROLA, 'ATRIX' ],
-		'MB861':									[ STRINGS_MOTOROLA, 'ATRIX' ],
-		'mb861':									[ STRINGS_MOTOROLA, 'ATRIX' ],
-		'MB865':									[ STRINGS_MOTOROLA, 'ATRIX 2' ],
-		'MB870':									[ STRINGS_MOTOROLA, 'Droid X2' ],
-		'MB886':									[ STRINGS_MOTOROLA, 'DINARA' ],
-		'ME501':									[ STRINGS_MOTOROLA, 'CLIQ XT' ],
-		'ME511':									[ STRINGS_MOTOROLA, 'FLIPOUT' ],
-		'me525':									[ STRINGS_MOTOROLA, 'MOTO ME525' ],
-		'Me525':									[ STRINGS_MOTOROLA, 'MOTO ME525' ],
-		'ME525':									[ STRINGS_MOTOROLA, 'MOTO ME525' ],
-		'ME525+':									[ STRINGS_MOTOROLA, 'MOTO ME525' ],
-		'ME600':									[ STRINGS_MOTOROLA, 'BACKFLIP' ],
-		'ME632':									[ STRINGS_MOTOROLA, 'PRO+' ],
-		'ME722':									[ STRINGS_MOTOROLA, 'Milestone 2' ],
-		'ME811':									[ STRINGS_MOTOROLA, 'Droid X' ],
-		'ME860':									[ STRINGS_MOTOROLA, 'ATRIX' ],
-		'ME863':									[ STRINGS_MOTOROLA, 'Milestone 3' ],
-		'ME865':									[ STRINGS_MOTOROLA, 'ATRIX 2' ],
-		'MT620':									[ STRINGS_MOTOROLA, 'MOTO MT620' ],
-		'MT620t':									[ STRINGS_MOTOROLA, 'MOTO MT620' ],
-		'MT716':									[ STRINGS_MOTOROLA, 'MOTO MT716' ],
-		'MT810':									[ STRINGS_MOTOROLA, 'MOTO MT810' ],
-		'MT870':									[ STRINGS_MOTOROLA, 'MOTO MT870' ],
-		'MT917':									[ STRINGS_MOTOROLA, 'MT917' ],
-		'MZ505':									[ STRINGS_MOTOROLA, 'XOOM Family Edition', 'tablet' ],
-		'MZ600':									[ STRINGS_MOTOROLA, 'XOOM 4G LTE', 'tablet' ],
-		'MZ601':									[ STRINGS_MOTOROLA, 'XOOM 3G', 'tablet' ],
-		'MZ602':									[ STRINGS_MOTOROLA, 'XOOM 4G LTE', 'tablet' ],
-		'MZ603':									[ STRINGS_MOTOROLA, 'XOOM 3G', 'tablet' ],
-		'MZ604':									[ STRINGS_MOTOROLA, 'XOOM WiFi', 'tablet' ],
-		'MZ605':									[ STRINGS_MOTOROLA, 'XOOM 3G', 'tablet' ],
-		'MZ606':									[ STRINGS_MOTOROLA, 'XOOM WiFi', 'tablet' ],
-		'MZ607':									[ STRINGS_MOTOROLA, 'XOOM 2 WiFi Media Edition', 'tablet' ],
-		'MZ609':									[ STRINGS_MOTOROLA, 'Droid XYBOARD 8.2', 'tablet' ],
-		'MZ609 4G':									[ STRINGS_MOTOROLA, 'Droid XYBOARD 8.2', 'tablet' ],
-		'MZ615':									[ STRINGS_MOTOROLA, 'XOOM 2 WiFi', 'tablet' ],
-		'MZ617':									[ STRINGS_MOTOROLA, 'Droid XYBOARD 10.1', 'tablet' ],
-		'MZ617 4G':									[ STRINGS_MOTOROLA, 'Droid XYBOARD 10.1', 'tablet' ],
-		'WX435':									[ STRINGS_MOTOROLA, 'TRIUMPH WX435' ],
-		'WX445':									[ STRINGS_MOTOROLA, 'CITRUS WX445' ],
-		'XT300':									[ STRINGS_MOTOROLA, 'SPICE' ],
-		'XT301':									[ STRINGS_MOTOROLA, 'MOTO XT301' ],
-		'XT311':									[ STRINGS_MOTOROLA, 'FIRE' ],
-		'XT316':									[ STRINGS_MOTOROLA, 'MOTO XT316' ],
-		'XT319':									[ STRINGS_MOTOROLA, 'MOTO XT319' ],
-		'XT320':									[ STRINGS_MOTOROLA, 'DEFY Mini' ],
-		'XT321':									[ STRINGS_MOTOROLA, 'DEFY Mini' ],
-		'XT500':									[ STRINGS_MOTOROLA, 'MOTO XT500' ],
-		'xt-500':									[ STRINGS_MOTOROLA, 'MOTO XT500' ],
-		'XT502':									[ STRINGS_MOTOROLA, 'QUENCH XT5' ],
-		'XT530':									[ STRINGS_MOTOROLA, 'FIRE XT' ],
-		'XT531':									[ STRINGS_MOTOROLA, 'FIRE XT' ],
-		'XT532':									[ STRINGS_MOTOROLA, 'XT532' ],	
-		'XT535':									[ STRINGS_MOTOROLA, 'DEFY' ],	
-		'XT550':									[ STRINGS_MOTOROLA, 'XT550' ],	
-		'XT556':									[ STRINGS_MOTOROLA, 'XT556' ],	
-		'XT603':									[ STRINGS_MOTOROLA, 'ADMIRAL' ],
-		'XT605':									[ STRINGS_MOTOROLA, 'XT605' ],	
-		'XT610':									[ STRINGS_MOTOROLA, 'Droid Pro' ],
-		'XT615':									[ STRINGS_MOTOROLA, 'MOTO XT615' ],
-		'XT626':									[ STRINGS_MOTOROLA, 'MOTO XT626' ],
-		'XT681':									[ STRINGS_MOTOROLA, 'MOTO XT681' ],
-		'XT682':									[ STRINGS_MOTOROLA, 'Droid 3' ],
-		'XT685':									[ STRINGS_MOTOROLA, 'MOTO XT685' ],
-		'XT687':									[ STRINGS_MOTOROLA, 'ATRIX TV' ],
-		'XT701':									[ STRINGS_MOTOROLA, 'XT701' ],
-		'XT702':									[ STRINGS_MOTOROLA, 'MOTO XT702' ],
-		'XT711':									[ STRINGS_MOTOROLA, 'MOTO XT711' ],
-		'XT720':									[ STRINGS_MOTOROLA, 'Milestone' ],
-		'XT788':									[ STRINGS_MOTOROLA, 'XT788' ],
-		'XT875':									[ STRINGS_MOTOROLA, 'Droid Bionic' ],
-		'XT800':									[ STRINGS_MOTOROLA, 'MOTO XT800' ],
-		'XT800+':									[ STRINGS_MOTOROLA, 'MOTO XT800' ],
-		'XT800W':									[ STRINGS_MOTOROLA, 'MOTO Glam' ],
-		'XT806':									[ STRINGS_MOTOROLA, 'MOTO XT806' ],
-		'XT860':									[ STRINGS_MOTOROLA, 'Milestone 3' ],
-		'XT862':									[ STRINGS_MOTOROLA, 'Droid 3' ],
-		'XT882':									[ STRINGS_MOTOROLA, 'MOTO XT882' ],
-		'XT883':									[ STRINGS_MOTOROLA, 'Milestone 3' ],
-		'XT885':									[ STRINGS_MOTOROLA, 'RAZR V' ],
-		'XT889':									[ STRINGS_MOTOROLA, 'XT889' ],
-		'XT897':									[ STRINGS_MOTOROLA, 'Droid 4' ],
-		'XT901':									[ STRINGS_MOTOROLA, 'RAZR' ],
-		'XT907':									[ STRINGS_MOTOROLA, 'Droid RAZR Mini' ],
-		'XT910':									[ STRINGS_MOTOROLA, 'RAZR' ],
-		'XT910K':									[ STRINGS_MOTOROLA, 'RAZR' ],
-		'XT910S':									[ STRINGS_MOTOROLA, 'RAZR' ],
-		'XT910 4G':									[ STRINGS_MOTOROLA, 'RAZR' ],
-		'XT912':									[ STRINGS_MOTOROLA, 'Droid RAZR' ],
-		'XT923':									[ STRINGS_MOTOROLA, 'Droid RAZR HD' ],
-		'XT925':									[ STRINGS_MOTOROLA, 'Droid RAZR HD' ],
-		'XT926':									[ STRINGS_MOTOROLA, 'Droid RAZR' ],
-		'XT926 4G':									[ STRINGS_MOTOROLA, 'Droid RAZR' ],
-		'XT928':									[ STRINGS_MOTOROLA, 'XT928' ],
-		'Atrix 2':									[ STRINGS_MOTOROLA, 'ATRIX 2' ],
-		'Atrix 4g':									[ STRINGS_MOTOROLA, 'ATRIX 4G' ],
-		'Atrix 4G':									[ STRINGS_MOTOROLA, 'ATRIX 4G' ],
-		'Atrix 4G ME860':							[ STRINGS_MOTOROLA, 'ATRIX 4G' ],
-		'CLIQ':										[ STRINGS_MOTOROLA, 'CLIQ' ],
-		'CLIQ XT':									[ STRINGS_MOTOROLA, 'CLIQ XT' ],
-		'CLIQ2':									[ STRINGS_MOTOROLA, 'CLIQ 2' ],
-		'Corvair':									[ STRINGS_MOTOROLA, 'Corvair', 'tablet' ],
-		'DEFY':										[ STRINGS_MOTOROLA, 'DEFY' ],
-		'Defy+':									[ STRINGS_MOTOROLA, 'DEFY+' ],
-		'Defy Plus':								[ STRINGS_MOTOROLA, 'DEFY+' ],
-		'Devour':									[ STRINGS_MOTOROLA, 'Devour' ],
-		'Dext':										[ STRINGS_MOTOROLA, 'Dext' ],
-		'Droid':									[ STRINGS_MOTOROLA, 'Droid' ],
-		'DROID':									[ STRINGS_MOTOROLA, 'Droid' ],
-		'DROID2':									[ STRINGS_MOTOROLA, 'Droid 2' ],
-		'DROID2 GLOBAL':							[ STRINGS_MOTOROLA, 'Droid 2' ],
-		'DROID2 Global':							[ STRINGS_MOTOROLA, 'Droid 2' ],
-		'Droid2Global':								[ STRINGS_MOTOROLA, 'Droid 2' ],
-		'DROID 2':									[ STRINGS_MOTOROLA, 'Droid 2' ],
-		'DROID3':									[ STRINGS_MOTOROLA, 'Droid 3' ],
-		'DROID4':									[ STRINGS_MOTOROLA, 'Droid 4' ],
-		'DROID4 4G':								[ STRINGS_MOTOROLA, 'Droid 4' ],
-		'DROID Pro':								[ STRINGS_MOTOROLA, 'Droid Pro' ],
-		'DROID BIONIC':								[ STRINGS_MOTOROLA, 'Droid Bionic' ],
-		'DROID BIONIC 4G':							[ STRINGS_MOTOROLA, 'Droid Bionic' ],
-		'DROID BIONIC XT875 4G':					[ STRINGS_MOTOROLA, 'Droid Bionic' ],
-		'DROIDRAZR':								[ STRINGS_MOTOROLA, 'Droid RAZR' ],
-		'Droid Razr':								[ STRINGS_MOTOROLA, 'Droid RAZR' ],
-		'DROID RAZR':								[ STRINGS_MOTOROLA, 'Droid RAZR' ],
-		'DROID RAZR 4G':							[ STRINGS_MOTOROLA, 'Droid RAZR' ],
-		'DROID SPYDER':								[ STRINGS_MOTOROLA, 'Droid RAZR' ],
-		'DROID RAZR HD':							[ STRINGS_MOTOROLA, 'Droid RAZR HD' ],
-		'DROID RAZR HD 4G':							[ STRINGS_MOTOROLA, 'Droid RAZR HD' ],
-		'DroidX':									[ STRINGS_MOTOROLA, 'Droid X' ],
-		'DROIDX':									[ STRINGS_MOTOROLA, 'Droid X' ],
-		'droid x':									[ STRINGS_MOTOROLA, 'Droid X' ],
-		'Droid X':									[ STRINGS_MOTOROLA, 'Droid X' ],
-		'DROID X':									[ STRINGS_MOTOROLA, 'Droid X' ],
-		'DROID X2':									[ STRINGS_MOTOROLA, 'Droid X2' ],
-		'Electrify':								[ STRINGS_MOTOROLA, 'Electrify' ],
-		'Milestone XT720':							[ STRINGS_MOTOROLA, 'Milestone' ],
-		'Milestone Xt720':							[ STRINGS_MOTOROLA, 'Milestone' ],
-		'Milestone':								[ STRINGS_MOTOROLA, 'Milestone' ],
-		'A853 Milestone':							[ STRINGS_MOTOROLA, 'Milestone' ],
-		'Milestone X':								[ STRINGS_MOTOROLA, 'Milestone X' ],
-		'Milestone X2':								[ STRINGS_MOTOROLA, 'Milestone X2' ],
-		'MotoroiX':									[ STRINGS_MOTOROLA, 'Droid X' ],
-		'Moto Backflip':							[ STRINGS_MOTOROLA, 'BACKFLIP' ],
-		'RAZR':										[ STRINGS_MOTOROLA, 'RAZR' ],
-		'Triumph':									[ STRINGS_MOTOROLA, 'TRIUMPH' ],
-		'Opus One':									[ STRINGS_MOTOROLA, 'i1' ],
-		'Photon':									[ STRINGS_MOTOROLA, 'PHOTON' ],
-		'Photon 4G':								[ STRINGS_MOTOROLA, 'PHOTON 4G' ],
-		'XOOM':										[ STRINGS_MOTOROLA, 'XOOM', 'tablet' ],
-		'Xoom':										[ STRINGS_MOTOROLA, 'XOOM', 'tablet' ],
-		'XOOM 2':									[ STRINGS_MOTOROLA, 'XOOM 2', 'tablet' ],
-		'XOOM 2 ME':								[ STRINGS_MOTOROLA, 'XOOM 2', 'tablet' ],
-		'XOOM MZ606':								[ STRINGS_MOTOROLA, 'XOOM WiFi', 'tablet' ],
-		'ISW11M':									[ STRINGS_MOTOROLA, 'PHOTON' ],
-		'IS12M':									[ STRINGS_MOTOROLA, 'RAZR' ],
-		'MOTWX435KT':								[ STRINGS_MOTOROLA, 'TRIUMPH' ],
-		'X3-Ice MIUI XT720 Memorila Classics':		[ STRINGS_MOTOROLA, 'Milestone' ],
-		'NABI-A':									[ 'Nabi', 'Kids tablet', 'tablet' ],
-		'Newpad':									[ 'Newsmy', 'Newpad', 'tablet' ],
-		'Newpad-K97':								[ 'Newsmy', 'Newpad K97', 'tablet' ],
-		'Newpad P9':								[ 'Newsmy', 'Newpad P9', 'tablet' ],
-		'M-PAD N8':									[ 'Newsmy', 'M-pad N8', 'tablet' ],
-		'LT-NA7':									[ 'NEC', 'LT-NA7' ],
-		'N-01D':									[ 'NEC', 'MEDIAS PP N-01D' ],
-		'N-04C':									[ 'NEC', 'MEDIAS N-04C' ],
-		'N-04D':									[ 'NEC', 'MEDIAS LTE N-04D' ],
-		'N-05D':									[ 'NEC', 'MEDIAS ES N-05D' ],
-		'N-06C':									[ 'NEC', 'MEDIAS WP N-06C' ],
-		'N-06D':									[ 'NEC', 'MEDIAS Tab N-06D', 'tablet' ],
-		'N-07D':									[ 'NEC', 'MEDIAS X N-07D' ],
-		'101N':										[ 'NEC', 'MEDIAS CH Softbank 101N' ],
-		'IS11N':									[ 'NEC', 'MEDIAS BR IS11N' ],
-		'Nexian NX-A890':							[ 'Nexian', 'Journey' ],
-		'NX-A891':									[ 'Nexian', 'Ultra Journey' ],
-		'M726HC':									[ 'Nextbook', 'Premium 7', 'ereader' ],
-		'NXM726HN':									[ 'Nextbook', 'Premium 7', 'ereader' ],
-		'NXM803HD':									[ 'Nextbook', 'Premium 8', 'ereader' ],
-		'DATAM803HC':								[ 'Nextbook', 'Premium 8', 'ereader' ],
-		'NXM901':									[ 'Nextbook', 'Next 3', 'ereader'],
-		'NGM Vanity Smart':							[ 'NGM', 'Vanity Smart' ],
-		'Nokia N9':									[ 'Nokia', 'N9' ],
-		'Nokia N900':								[ 'Nokia', 'N900' ],
-		'Lumia800':									[ 'Nokia', 'Lumia 800' ],
-		'Lumia 900':								[ 'Nokia', 'Lumia 900' ],
-		'Notion Ink ADAM':							[ 'Notion Ink', 'ADAM', 'tablet' ],
-		'Adam':										[ 'Notion Ink', 'ADAM', 'tablet' ],
-		'P4D SIRIUS':								[ 'Nvsbl', 'P4D SIRIUS', 'tablet' ],
-		'P4D Sirius':								[ 'Nvsbl', 'P4D SIRIUS', 'tablet' ],
-		'EFM710A':									[ 'Oblio', 'Mint 7x', 'tablet' ],
-		'ODYS-Xpress':								[ 'Odys', 'Xpress', 'tablet' ],
-		'Olivetti Olipad 100':						[ 'Olivetti', 'Olipad 100', 'tablet' ],
-		'OP110':									[ 'Olivetti', 'Olipad 110', 'tablet' ],
-		'ONDA MID':									[ 'Onda', 'MID', 'tablet' ],
-		'VX580A':									[ 'Onda', 'VX580A', 'tablet' ],
-		'VX610A':									[ 'Onda', 'VX610A', 'tablet' ],
-		'TQ150':									[ 'Onda', 'TQ150' ],
-		'N2T':										[ 'ONN', 'N2T', 'tablet' ],
-		'Renesas':									[ 'Opad', 'Renesas', 'tablet' ],
-		'renesas emev':								[ 'Opad', 'Renesas', 'tablet' ],						
-		'X903':										[ 'Oppo', 'Find Me X903' ],
-		'X905':										[ 'Oppo', 'Find 3 X905' ],
-		'OPPOX905':									[ 'Oppo', 'Find 3 X905' ],
-		'OPPOX907':									[ 'Oppo', 'Finder X907' ],
-		'X9015':									[ 'Oppo', 'Find X9015' ],
-		'OPPOX9017':								[ 'Oppo', 'Finder X9017' ],
-		'OPPOR801':									[ 'Oppo', 'Real R801' ],
-		'OPPOR805':									[ 'Oppo', 'Real R805' ],
-		'OPPOR807':									[ 'Oppo', 'Real R807' ],
-		'OPPOT703':									[ 'Oppo', 'T703' ],
-		'OPPOU7011':								[ 'Oppo', 'Find Gemini U7011' ],
-		'P-01D':									[ 'Panasonic', 'P-01D' ],
-		'P-02D':									[ 'Panasonic', 'Lumix Phone' ],
-		'P-04D':									[ 'Panasonic', 'Eluga' ],
-		'P-07C':									[ 'Panasonic', 'P-07C' ],
-		'dL1':										[ 'Panasonic', 'Eluga dL1' ],
-		'101P':										[ 'Panasonic', 'Lumix Phone' ],
-		'JT-H580VT':								[ 'Panasonic', 'BizPad 7', 'tablet' ],
-		'JT-H581VT':								[ 'Panasonic', 'BizPad 10', 'tablet' ],
-		'FZ-A1A':									[ 'Panasonic', 'Toughpad', 'tablet' ],
-		'pandigital9hr':							[ 'Pandigital', '9HR', 'tablet' ],
-		'pandigital9hr2':							[ 'Pandigital', '9HR2', 'tablet' ],
-		'pandigitalopc1':							[ 'Pandigital', 'OPC1', 'tablet' ],
-		'pandigitalopp1':							[ 'Pandigital', 'OPP1', 'tablet' ],
-		'pandigitalp1hr':							[ 'Pandigital', 'p1hr', 'tablet' ],
-		'IM-A600S':									[ STRINGS_PANTECH, 'SIRIUS α' ],
-		'IM-A630K':									[ STRINGS_PANTECH, 'SKY Izar' ],
-		'IM-A690L':									[ STRINGS_PANTECH, 'SKY' ],
-		'IM-A690S':									[ STRINGS_PANTECH, 'SKY' ],
-		'IM-A710K':									[ STRINGS_PANTECH, 'SKY Vega Xpress' ],
-		'IM-A720L':									[ STRINGS_PANTECH, 'SKY Vega Xpress' ],
-		'IM-A725L':									[ STRINGS_PANTECH, 'SKY Vega X+' ],
-		'IM-A730s':									[ STRINGS_PANTECH, 'SKY Vega S' ],
-		'IM-A730S':									[ STRINGS_PANTECH, 'SKY Vega S' ],
-		'IM-A750K':									[ STRINGS_PANTECH, 'SKY Mirach A' ],
-		'IM-A760S':									[ STRINGS_PANTECH, 'SKY Vega Racer' ],
-		'IM-A770K':									[ STRINGS_PANTECH, 'SKY Vega Racer' ],
-		'IM-A780L':									[ STRINGS_PANTECH, 'SKY Vega Racer' ],
-		'IM-A800S':									[ STRINGS_PANTECH, 'SKY Vega LTE' ],
-		'IM-A810K':									[ STRINGS_PANTECH, 'SKY Vega LTE M' ],
-		'IM-A810S':									[ STRINGS_PANTECH, 'SKY Vega LTE M' ],
-		'IM-A820L':									[ STRINGS_PANTECH, 'SKY Vega LTE EX' ],
-		'IM-A830K':									[ STRINGS_PANTECH, 'SKY Vega Racer 2' ],
-		'IM-A830L':									[ STRINGS_PANTECH, 'SKY Vega Racer 2' ],
-		'IM-A830S':									[ STRINGS_PANTECH, 'SKY Vega Racer 2' ],
-		'IM-A840S':									[ STRINGS_PANTECH, 'SKY Vega S5' ],
-		'IM-A850K':									[ STRINGS_PANTECH, 'IM-A850K' ],	
-		'IM-T100K':									[ STRINGS_PANTECH, 'SKY Vega No. 5', 'tablet' ],
-		'IS06':										[ STRINGS_PANTECH, 'SIRIUS α' ],
-		'ADR8995':									[ STRINGS_PANTECH, 'Breakout' ],
-		'ADR8995 4G':								[ STRINGS_PANTECH, 'Breakout' ],
-		'ADR910L 4G':								[ STRINGS_PANTECH, 'ADR910L' ],
-		'PantechP4100':								[ STRINGS_PANTECH, 'Element', 'tablet' ],
-		'PantechP8000':								[ STRINGS_PANTECH, 'Crossover' ],
-		'PantechP8010':								[ STRINGS_PANTECH, 'Flex' ],
-		'PantechP9060':								[ STRINGS_PANTECH, 'Pocket' ],
-		'PantechP9070':								[ STRINGS_PANTECH, 'Burst' ],
-		'PantechP9090':								[ STRINGS_PANTECH, 'Magnus' ],
-		'SKY IM-A600S':								[ STRINGS_PANTECH, 'SIRIUS α' ],
-		'SKY IM-A630K':								[ STRINGS_PANTECH, 'SKY Izar' ],
-		'SKY IM-A650S':								[ STRINGS_PANTECH, 'SKY Vega' ],
-		'IS11PT':									[ STRINGS_PANTECH, 'Mirach IS11PT' ],
-		'PAT712W':									[ 'Perfeo', 'PAT712W', 'tablet' ],
-		'X7G':										[ 'Pearl', 'Touchlet X7G', 'tablet' ],
-		'FWS810':									[ 'PHICOMM', 'FWS810' ],
-		'Philips PI5000':							[ 'Philips', 'PI5000', 'tablet' ],
-		'PI7000':									[ 'Philips', 'PI7000', 'tablet' ],
-		'Philips W626':								[ 'Philips', 'W626' ],
-		'Philips W632':								[ 'Philips', 'W632' ],
-		'MOMO':										[ 'Ployer', 'MOMO', 'tablet' ],
-		'MOMO8':									[ 'Ployer', 'MOMO8', 'tablet' ],
-		'MOMO15':									[ 'Ployer', 'MOMO15', 'tablet' ],
-		'PocketBook A7':							[ 'PocketBook', 'A7', 'tablet' ],
-		'PocketBook A10':							[ 'PocketBook', 'A10', 'tablet' ],
-		'Mobii 7':									[ 'Point Of View', 'Mobii 7', 'tablet' ],
-		'PMP3384BRU':								[ 'Prestigio', 'Multipad 3384', 'tablet' ],
-		'TB07FTA':									[ 'Positivo', 'TB07FTA', 'tablet' ],
-		'QW TB-1207':								[ 'Qware', 'Pro3', 'tablet' ],
-		'W6HD ICS':									[ 'Ramos', 'W6HD', 'tablet' ],
-		'w10':										[ 'Ramos', 'W10', 'tablet' ],
-		'W10':										[ 'Ramos', 'W10', 'tablet' ],
-		'w10 v2.0':									[ 'Ramos', 'W10 v2.0', 'tablet' ],
-		'W10 V2.0':									[ 'Ramos', 'W10 v2.0', 'tablet' ],
-		'T11AD':									[ 'Ramos', 'T11AD', 'tablet' ],
-		'T11AD.FE':									[ 'Ramos', 'T11AD', 'tablet' ],
-		'Rikomagic MK802':							[ 'Rikomagic', 'MK802', 'television' ],
-		'PlayBook':									[ 'RIM', 'BlackBerry PlayBook', 'tablet' ],
-		'RBK-490':									[ 'Ritmix', 'RBK-490', 'tablet' ],
-		'A8HD':										[ 'Saayi', 'Dropad A8HD', 'tablet' ],
-		'Galaxy Nexus':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
-		'GT-B5330':									[ STRINGS_SAMSUNG, 'GT-B5330' ],
-		'GT-B5510':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y Pro' ],
-		'GT-B5510B':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y Pro' ],
-		'GT-B5510L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y Pro' ],
-		'GT-B5512':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y Pro Duos' ],
-		'GT-B7510':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Pro' ],
-		'GT-B7510L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Pro' ],
-		'GT-I5500':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' 5' ],
-		'GT-I5500B':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' 5' ],
-		'GT-I5500L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' 5' ],
-		'GT-I5500M':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' 5' ],
-		'GT-I5500-MR3':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' 5' ],
-		'GT-I5503':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' 5' ],
-		'GT-I5508':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' 5' ],
-		'GT-I5510':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' 551' ],
-		'GT-I5510L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' 551' ],
-		'GT-I5510M':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' 551' ],
-		'GT-I5510T':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' 551' ],
-		'GT-I5700':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Spica' ],
-		'GT-I5700L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Spica' ],
-		'GT-I5800':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Apollo' ],
-		'GT-I5800D':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Apollo' ],
-		'GT-I5800L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Apollo' ],
-		'GT-I5801':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Apollo' ],
-		'GT-I6500U':								[ STRINGS_SAMSUNG, 'Saturn' ],
-		'GT-I777':									[ STRINGS_SAMSUNG, 'Singa' ],
-		'GT-I8000':									[ STRINGS_SAMSUNG, 'Omnia 2' ],
-		'GT-I8150':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' W' ],
-		'GT-I8150B':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' W' ],
-		'GT-I8160':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace 2' ],
-		'GT-I8160L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace 2' ],
-		'GT-I8160P':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace 2' ],
-		'GT-I8250':									[ STRINGS_SAMSUNG, 'GT-I8250' ],
-		'GT-I8320':									[ STRINGS_SAMSUNG, 'H1' ],
-		'GT-I8520':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Beam' ],
-		'GT-I8530':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Beam' ],
-		'GT-i9000':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
-		'GT-I9000':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
-		'GT-I9000B':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
-		'GT-I9000M':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Vibrant' ],
-		'GT-I9000T':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
-		'GT-I9001':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Plus' ],
-		'GT-I9003':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' SL' ],
-		'GT-I9003L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' SL' ],
-		'GT-I9008':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
-		'GT-I9008L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
-		'GT-I9010':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Giorgio Armani' ],
-		'GT-I9018':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' GT-I9018' ],
-		'GT-I9050':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' GT-I9050' ],
-		'GT-I9070':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Advance' ],
-		'GT-I9070P':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Advance' ],
-		'GT-I9088':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
-		'GT-i9100':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
-		'GT-I9100':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
-		'GT-I9100G':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
-		'GT-I9100M':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
-		'GT-I9100T':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
-		'GT-I9100P':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
-		'GT-I9103':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' R' ],
-		'GT-I9108':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
-		'GT-I9210':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II LTE' ],
-		'GT-I9210T':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II LTE' ],
-		'GT-I9220':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
-		'GT-I9228':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
-		'GT-I9250':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
-		'GT-I9250 EUR XX':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
-		'GT-I9300':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
-		'GT-I9300T':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
-		'GT-I9303T':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
-		'GT-I9305T':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
-		'GT-I9308':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
-		'GT-I9500':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' GT-I9500' ],
-		'GT-I9800':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' GT-I9800' ],
-		'GT-N7000':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
-		'GT-N7000B':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
-		'GT-N7100':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note II' ],
-		'GT-N7105':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note II' ],
-		'GT-N8000':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note 10.1' ],
-		'GT-N8010':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note 10.1' ],
-		'GT-N8013':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note 10.1' ],
-		'GT-P1000':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', 'tablet' ],
-		'GT-P1000L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', 'tablet' ],
-		'GT-P1000M':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', 'tablet' ],
-		'GT-P1000N':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', 'tablet' ],
-		'GT-P1000T':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', 'tablet' ],
-		'GT-P1000 Tablet':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', 'tablet' ],
-		'GT-P1010':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', 'tablet' ],
-		'GT-P3100':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 2 (7.0)', 'tablet' ],
-		'GT-P3100B':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 2 (7.0)', 'tablet' ],
-		'GT-P3110':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 2 (7.0)', 'tablet' ],
-		'GT-P3113':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 2 (7.0)', 'tablet' ],
-		'GT-P5100':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 2 (10.1)', 'tablet' ],
-		'GT-P5110':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 2 (10.1)', 'tablet' ],
-		'GT-P5113':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 2 (10.1)', 'tablet' ],
-		'GT-P6200':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.0 Plus', 'tablet' ],
-		'GT-P6200L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.0 Plus', 'tablet' ],
-		'GT-P6201':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.0 Plus N', 'tablet' ],
-		'GT-P6210':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.0 Plus', 'tablet' ],
-		'GT-P6211':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.0 Plus N', 'tablet' ],
-		'GT-P6800':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.7', 'tablet' ],
-		'GT-P6810':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.7', 'tablet' ],
-		'GT-P7100':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1V', 'tablet' ],
-		'GT-P7300':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 8.9', 'tablet' ],
-		'GT-P7300B':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 8.9', 'tablet' ],
-		'GT-P7310':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 8.9', 'tablet' ],
-		'GT-P7320':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 8.9', 'tablet' ],
-		'GT-P7320T':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 8.9', 'tablet' ],
-		'GT-P7500':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1', 'tablet' ],
-		'GT-P7500D':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1', 'tablet' ],
-		'GT-P7500R':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1', 'tablet' ],
-		'GT-P7500V':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1', 'tablet' ],
-		'GT-P7501':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1N', 'tablet' ],
-		'GT-P7510':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1', 'tablet' ],
-		'GT-P7511':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1N', 'tablet' ],
-		'GT-S5300':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Pocket' ],
-		'GT-S5302':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Pocket Duos' ],
-		'GT-S5360':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y' ],
-		'GT-S5360B':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y' ],
-		'GT-S5360L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y' ],
-		'GT-S5360T':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y' ],
-		'GT-S5363':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y' ],
-		'GT-S5367':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y TV' ],
-		'GT-S5368':									[ STRINGS_SAMSUNG, 'GT-S5368' ],
-		'GT-S5369':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y' ],
-		'GT-S5570':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Mini' ],
-		'GT-S5570B':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Mini' ],
-		'GT-S5570I':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Mini' ],
-		'GT-S5570L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Mini' ],
-		'GT-S5578':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Mini' ],
-		'GT-S5660':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Gio' ],
-		'GT-S5660M':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Gio' ],
-		'GT-S5660V':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Gio' ],
-		'GT-S5670':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Fit' ],
-		'GT-S5670B':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Fit' ],
-		'GT-S5670L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Fit' ],
-		'GT-S5690':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Xcover' ],
-		'GT-S5690L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Xcover' ],
-		'GT-S5820':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace' ],
-		'GT-S5830':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace' ],
-		'GT-S5830B':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace' ],
-		'GT-S5830C':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace' ],
-		'GT-S5830D':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace' ],
-		'GT-S5830D-parrot':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace' ],
-		'GT-S5830i':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace' ],
-		'GT-S5830L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace' ],
-		'GT-S5830M':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace' ],
-		'GT-S5830T':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace' ],
-		'GT-S5838':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace' ],
-		'GT-S5839i':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace' ],
-		'GT-S6102':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y Duos' ],
-		'GT-S6102B':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y Duos' ],
-		'GT-S6102E':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y Duos' ],
-		'GT-S6500':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Mini 2' ],
-		'GT-S6500D':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Mini 2' ],
-		'GT-S6702':									[ STRINGS_SAMSUNG, 'GT-S6702' ],
-		'GT-S6802':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace Duos' ],
-		'GT-S7500':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace Plus' ],
-		'GT-S7500L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace Plus' ],
-		'GT-S7500W':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace Plus' ],
-		'GT-S7562':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Duos' ],
-		'GT-T959':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Vibrant' ],
-		'SCH-i509':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y' ],
-		'SCH-i559':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Pop' ],
-		'SCH-i569':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Gio' ],
-		'SCH-i579':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace' ],
-		'SCH-i589':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace Duos' ],
-		'SCH-i705 4G':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 2 (7.0)', 'tablet' ],
-		'SCH-i809':									[ STRINGS_SAMSUNG, 'SCH-i809' ],
-		'SCH-i889':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
-		'SCH-i909':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
-		'SCH-i919':									[ STRINGS_SAMSUNG, 'SCH-i919' ],
-		'SCH-i929':									[ STRINGS_SAMSUNG, 'SCH-i929' ],
-		'SCH-I100':									[ STRINGS_SAMSUNG, 'Gem' ],
-		'SCH-I110':									[ STRINGS_SAMSUNG, 'Illusion' ],
-		'SCH-I200':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Stellar' ],
-		'SCH-I400':									[ STRINGS_SAMSUNG, 'Continuum' ],
-		'SCH-I405':									[ STRINGS_SAMSUNG, 'Stratosphere' ],
-		'SCH-I405 4G':								[ STRINGS_SAMSUNG, 'Stratosphere' ],
-		'SCH-I405U':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Metrix' ],
-		'SCH-I500':									[ STRINGS_SAMSUNG, 'Fascinate' ],
-		'SCH-I510':									[ STRINGS_SAMSUNG, 'Stealth V' ],
-		'SCH-I510 4G':								[ STRINGS_SAMSUNG, 'Droid Charge' ],
-		'SCH-I515':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
-		'SCH-I535':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
-		'SCH-I535 4G':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
-		'SCH-I619':									[ STRINGS_SAMSUNG, 'SCH-I619' ],
-		'SCH-I779':									[ STRINGS_SAMSUNG, 'SCH-I779' ],
-		'SCH-I800':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.0', 'tablet' ],
-		'SCH-I815':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.7', 'tablet' ],
-		'SCH-I815 4G':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.7', 'tablet' ],
-		'SCH-I905':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1', 'tablet' ],
-		'SCH-I905 4G':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1', 'tablet' ],
-		'SCH-I909':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
-		'SCH-I915':									[ STRINGS_SAMSUNG, 'SCH-I915' ],
-		'SCH-I939':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
-		'SCH-M828C':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Precedent' ],
-		'SCH-M828C[9096483449]':					[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Precedent' ],
-		'SCH-R530U':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
-		'SCH-R680':									[ STRINGS_SAMSUNG, 'Repp' ],
-		'SCH-R720':									[ STRINGS_SAMSUNG, 'Admire' ],
-		'SCH-R730':									[ STRINGS_SAMSUNG, 'Transfix' ],
-		'SCH-R760':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
-		'SCH-R820':									[ STRINGS_SAMSUNG, 'SCH-R820' ],
-		'SCH-R880':									[ STRINGS_SAMSUNG, 'Acclaim' ],
-		'SCH-R910':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Indulge 4G' ],
-		'SCH-R915':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Indulge' ],
-		'SCH-R920':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Attain 4G' ],
-		'SCH-R930':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Aviator' ],
-		'SCH-R940':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Lightray' ],
-		'SCH-S720C':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Proclaim' ],
-		'SCH-S735C':								[ STRINGS_SAMSUNG, 'SCH-S735' ],
-		'SCH-W899':									[ STRINGS_SAMSUNG, 'SCH-W899' ],
-		'SCH-W999':									[ STRINGS_SAMSUNG, 'SCH-W999' ],
-		'SGH-I547':									[ STRINGS_SAMSUNG, 'SGH-I547' ],
-		'SGH-I717':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
-		'SGH-I717D':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
-		'SGH-I717M':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
-		'SGH-I717R':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
-		'SGH-I727':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II Skyrocket' ],
-		'SGH-i727R':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
-		'SGH-I727R':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
-		'SGH-I747':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
-		'SGH-I747M':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
-		'SGH-I748':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
-		'SGH-I757':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II Skyrocket HD' ],
-		'SGH-I757M':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II Skyrocket HD' ],
-		'SGH-I777':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
-		'SGH-I9777':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
-		'SGH-I896':									[ STRINGS_SAMSUNG, 'Captivate' ],
-		'SGH-I897':									[ STRINGS_SAMSUNG, 'Captivate' ],
-		'SGH-I927':									[ STRINGS_SAMSUNG, 'Captivate Glide' ],
-		'SGH-I927R':								[ STRINGS_SAMSUNG, 'Captivate Glide' ],
-		'SGH-I957':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 8.9', 'tablet' ],
-		'SGH-I957D':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 8.9', 'tablet' ],
-		'SGH-I957M':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 8.9', 'tablet' ],
-		'SGH-I957R':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 8.9', 'tablet' ],
-		'SGH-I987':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.0', 'tablet' ],
-		'SGH-I997':									[ STRINGS_SAMSUNG, 'Infuse 4G' ],
-		'SGH-I997R':								[ STRINGS_SAMSUNG, 'Infuse 4G' ],
-		'SGH-I9000':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
-		'SGH-S730G':								[ STRINGS_SAMSUNG, 'SGH-S730' ],
-		'SGH-T499':									[ STRINGS_SAMSUNG, 'Dart' ],
-		'SGH-T499V':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Mini' ],
-		'SGH-T499Y':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Mini' ],
-		'SGH-T589':									[ STRINGS_SAMSUNG, 'Gravity Smart' ],
-		'SGH-T589R':								[ STRINGS_SAMSUNG, 'Gravity Smart' ],
-		'SGH-T679':									[ STRINGS_SAMSUNG, 'Exhibit II 4G' ],
-		'SGH-T679M':								[ STRINGS_SAMSUNG, 'Exhibit II 4G' ],
-		'SGH-T759':									[ STRINGS_SAMSUNG, 'Exhibit 4G' ],
-		'SGH-T769':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Blaze 4G' ],
-		'SGH-T839':									[ STRINGS_SAMSUNG, 'T-Mobile Sidekick' ],
-		'SGH-T849':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.0', 'tablet' ],
-		'SGH-T859':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1', 'tablet' ],
-		'SGH-T869':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.0 Plus', 'tablet' ],
-		'SGH-T879':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
-		'SGH-T959':									[ STRINGS_SAMSUNG, 'Vibrant' ],
-		'SGH-T959D':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Fascinate 3G+' ],
-		'SGH-T959P':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Fascinate 4G' ],
-		'SGH-T959V':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S 4G' ],
-		'SGH-T989':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
-		'SGH-T989D':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II X' ],
-		'SGH-T999':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Blaze 4G' ],
-		'SGH-T999V':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Blaze 4G' ],
-		'SHV-E120K':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II HD LTE' ],
-		'SHV-E120L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II HD LTE' ],
-		'SHV-E120S':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II HD LTE' ],
-		'SHV-E110S':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II LTE' ],
-		'SHV-E140K':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 8.9', 'tablet' ],
-		'SHV-E140S':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 8.9', 'tablet' ],
-		'SHV-E150S':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.7', 'tablet' ],
-		'SHV-E160K':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
-		'SHV-E160L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note LTE' ],
-		'SHV-E160S':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note LTE' ],
-		'SHV-E170K':								[ STRINGS_SAMSUNG, 'SHV-E170K' ],
-		'SHV-E170L':								[ STRINGS_SAMSUNG, 'SHV-E170L' ],
-		'SHV-E210K':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
-		'SHV-E210L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
-		'SHV-E210S':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
-		'SHV-E250S':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note II' ],
-		'SHW-M100S':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' A' ],
-		'SHW-M110S':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
-		'SHW-M130L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' U' ],
-		'SHW-M130K':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' K' ],
-		'SHW-M180K':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', 'tablet' ],
-		'SHW-M180L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', 'tablet' ],
-		'SHW-M180S':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', 'tablet' ],
-		'SHW-M180W':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', 'tablet' ],
-		'SHW-M185S':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', 'tablet' ],
-		'SHW-M190S':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Hoppin' ],
-		'SHW-M220L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Neo' ],
-		'SHW-M240S':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace' ],
-		'SHW-M250K':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
-		'SHW-M250L':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
-		'SHW-M250S':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
-		'SHW-M300W':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1', 'tablet' ],
-		'SHW-M305W':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 8.9', 'tablet' ],
-		'SHW-M340K':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' M Style' ],
-		'SHW-M340S':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' M Style' ],
-		'SHW-M380K':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1', 'tablet' ],
-		'SHW-M380S':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1', 'tablet' ],
-		'SHW-M380W':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1', 'tablet' ],
-		'SHW-M440S':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
-		'SMT-i9100':								[ STRINGS_SAMSUNG, 'SMT-I9100', 'tablet' ],
-		'SPH-D600':									[ STRINGS_SAMSUNG, 'Conquer 4G' ],
-		'SPH-D700':									[ STRINGS_SAMSUNG, 'Epic 4G' ],
-		'SPH-D705':									[ STRINGS_SAMSUNG, 'Epic 4G 2' ],
-		'SPH-D710':									[ STRINGS_SAMSUNG, 'Epic 4G Touch' ],
-		'SPH-D710BST':								[ STRINGS_SAMSUNG, 'Epic 4G Touch' ],
-		'SPH-L700':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
-		'SPH-L710':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
-		'SPH-M820':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Prevail' ],
-		'SPH-M820-BST':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Prevail' ],
-		'SPH-M580':									[ STRINGS_SAMSUNG, 'Replenish' ],
-		'SPH-M900':									[ STRINGS_SAMSUNG, 'Moment' ],
-		'SPH-M910':									[ STRINGS_SAMSUNG, 'Intercept' ],
-		'SPH-M920':									[ STRINGS_SAMSUNG, 'Transform' ],
-		'SPH-M930':									[ STRINGS_SAMSUNG, 'Transform Ultra' ],
-		'SPH-M930BST':								[ STRINGS_SAMSUNG, 'Transform Ultra' ],
-		'SPH-P100':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', 'tablet' ],
-		'YP-GB1':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Player', 'media' ],
-		'YP-GB70':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Player 70', 'media' ],
-		'YP-GB70D':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Player 70 Plus', 'media' ],
-		'YP-GS1':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S WiFi 3.6', 'media' ],
-		'YP-G1':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S WiFi 4.0', 'media' ],
-		'YP-GI1':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S WiFi 4.2', 'media' ],
-		'YP-G50':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Player', 'media' ],
-		'YP-G70':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S WiFi 5.0', 'media' ],
-		'GT9100':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
-		'I897':										[ STRINGS_SAMSUNG, 'Captivate' ],
-		'I7500':									[ STRINGS_SAMSUNG, 'Galaxy' ],
-		'I9000':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
-		'T959':										[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Vibrant' ],
-		'Captivate-I897':							[ STRINGS_SAMSUNG, 'Captivate' ],
-		'Galaxy':									[ STRINGS_SAMSUNG, STRINGS_GALAXY ],
-		'Galaxy Note':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
-		'GalaxyS':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
-		'Galaxy S II':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
-		'Galaxy X':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' X' ],
-		'Galaxy Spica':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Spica' ],
-		'GALAXY Tab':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', 'tablet' ],
-		'GALAXY NEXUS':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
-		'Vibrantmtd':								[ STRINGS_SAMSUNG, 'Vibrant' ],
-		'SC-01C':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', 'tablet' ],
-		'SC-01D':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1 LTE', 'tablet' ],
-		'SC-02B':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
-		'SC-02C':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
-		'SC-02D':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.0 Plus', 'tablet' ],
-		'SC-03D':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II LTE' ],
-		'SC-04D':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
-		'SC-05D':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note LTE' ],
-		'SC-06D':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
-		'ISW11SC':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II WiMAX' ],
-		'A01SH':									[ STRINGS_SHARP, 'A01SH' ],
-		'IS01':										[ STRINGS_SHARP, 'IS01' ],
-		'IS03':										[ STRINGS_SHARP, 'IS03' ],
-		'IS05':										[ STRINGS_SHARP, 'IS05' ],
-		'IS11SH':									[ STRINGS_SHARP, 'Aquos IS11SH' ],
-		'IS12SH':									[ STRINGS_SHARP, 'Aquos IS12SH' ],
-		'IS13SH':									[ STRINGS_SHARP, 'Aquos IS13SH' ],
-		'IS14SH':									[ STRINGS_SHARP, 'Aquos IS14SH' ],
-		'ISW16SH':									[ STRINGS_SHARP, 'Aquos ISW16SH' ],
-		'EB-W51GJ':									[ STRINGS_SHARP, 'EB-W51GJ' ],
-		'SBM003SH':									[ STRINGS_SHARP, 'Galapagos' ],
-		'SBM005SH':									[ STRINGS_SHARP, 'Galapagos' ],
-		'SBM006SH':									[ STRINGS_SHARP, 'Aquos' ],
-		'SBM007SH':									[ STRINGS_SHARP, 'Aquos 007SH' ],
-		'SBM009SH':									[ STRINGS_SHARP, 'Aquos 009SH' ],
-		'SBM102SH':									[ STRINGS_SHARP, 'Aquos 102SH' ],
-		'SBM103SH':									[ STRINGS_SHARP, 'Aquos 103SH' ],
-		'SBM104SH':									[ STRINGS_SHARP, 'Aquos 104SH' ],
-		'SBM107SH':									[ STRINGS_SHARP, 'Aquos 107SH' ],
-		'SBM107SHB':								[ STRINGS_SHARP, 'Aquos 107SH' ],
-		'SH-01D':									[ STRINGS_SHARP, 'Aquos SH-01D' ],
-		'SH-02D':									[ STRINGS_SHARP, 'Aquos slider SH-02D' ],
-		'SH-03C':									[ STRINGS_SHARP, 'Lynx 3D' ],
-		'SH-06D':									[ STRINGS_SHARP, 'Aquos SH-06D' ],
-		'SH-09D':									[ STRINGS_SHARP, 'Aquos Zeta SH-09D' ],
-		'SH-10B':									[ STRINGS_SHARP, 'Lynx' ],
-		'SH-12C':									[ STRINGS_SHARP, 'Aquos' ],
-		'SH-13C':									[ STRINGS_SHARP, 'Aquos f SH-13C' ],
-		'SH80F':									[ STRINGS_SHARP, 'Aquos SH80F' ],
-		'SH72x8U':									[ STRINGS_SHARP, 'SH72x8U' ],
-		'SH8118U':									[ STRINGS_SHARP, 'SH8118U' ],
-		'SH8128U':									[ STRINGS_SHARP, 'SH8128U' ],
-		'SH8158U':									[ STRINGS_SHARP, 'SH8158U' ],
-		'SH8188U':									[ STRINGS_SHARP, 'SH8188U' ],
-		'SH8268U':									[ STRINGS_SHARP, 'SH8268U' ],
-		'INFOBAR C01':								[ STRINGS_SHARP, 'INFOBAR C01' ],
-		'SPX-5':									[ 'Simvalley', 'SPX-5' ],
-		'SPX-5 3G':									[ 'Simvalley', 'SPX-5 3G' ],
-		'SmartQ G7':								[ 'SmartQ', 'G7', 'tablet' ],
-		'SmartQT7':									[ 'SmartQ', 'T7', 'tablet' ],
-		'SmartQT10':								[ 'SmartQ', 'T10', 'tablet' ],
-		'SmartQT15':								[ 'SmartQ', 'T15', 'tablet' ],
-		'SmartQT19':								[ 'SmartQ', 'T19', 'tablet' ],
-		'SmartQT20':								[ 'SmartQ', 'T20', 'tablet' ],
-		'OMS1 6':									[ STRINGS_SONY_ERICSSON, 'A8i' ],
-		'E10a':										[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10 Mini' ],
-		'E10i':										[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10 Mini' ],
-		'E10iv':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10 Mini' ],
-		'E15':										[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X8' ],
-		'E15a':										[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X8' ],
-		'E15i':										[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X8' ],
-		'E15iv':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X8' ],
-		'E15i-o':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X8' ],
-		'E16i':										[ STRINGS_SONY_ERICSSON, 'W8 Walkman' ],
-		'LT11i':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo V' ],
-		'LT15':										[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc' ],
-		'LT15a':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc' ],
-		'LT15i':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc' ],
-		'LT15iv':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc' ],
-		'LT15i-o':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc' ],
-		'LT18':										[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc S' ],
-		'LT18a':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc S' ],
-		'LT18i':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc S' ],
-		'LT18iv':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc S' ],
-		'LT18i-o':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc S' ],
-		'LT22i':									[ 'Sony', STRINGS_XPERIA + ' P' ],
-		'Lt26i':									[ 'Sony', STRINGS_XPERIA + ' S' ],
-		'LT26i':									[ 'Sony', STRINGS_XPERIA + ' S' ],
-		'LT26i-o':									[ 'Sony', STRINGS_XPERIA + ' S' ],
-		'LT26ii':									[ 'Sony', STRINGS_XPERIA + ' SL' ],
-		'LT26w':									[ 'Sony', STRINGS_XPERIA + ' Acro S' ],
-		'LT28at':									[ 'Sony', STRINGS_XPERIA + ' Ion' ],
-		'LT28h':									[ 'Sony', STRINGS_XPERIA + ' Ion' ],
-		'LT28i':									[ 'Sony', STRINGS_XPERIA + ' Ion' ],
-		'LT29i':									[ 'Sony', STRINGS_XPERIA + ' GX' ],
-		'SonyLT29i':								[ 'Sony', STRINGS_XPERIA + ' GX' ],
-		'SonyLT30a':								[ 'Sony', STRINGS_XPERIA + ' T' ],
-		'SonyLT30p':								[ 'Sony', STRINGS_XPERIA + ' T' ],
-		'LT30p':									[ 'Sony', STRINGS_XPERIA + ' T' ],
-		'MK16a':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Pro' ],
-		'MK16i':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Pro' ],
-		'MT11a':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo V' ],
-		'MT11i':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo V' ],
-		'MT11iv':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo V' ],
-		'MT11i-o':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo V' ],
-		'MT15a':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo' ],
-		'MT15i':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo' ],
-		'MT15iv':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo' ],
-		'MT15i-o':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo' ],
-		'MT25i':									[ 'Sony', STRINGS_XPERIA + ' Neo L' ],
-		'MT27i':									[ 'Sony', STRINGS_XPERIA + ' Sola' ],
-		'R800a':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Play' ],
-		'R800i':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Play' ],
-		'R800iv':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Play' ],
-		'R800at':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Play' ],
-		'R800x':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Play' ],
-		'SK17a':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Mini Pro' ],
-		'SK17i':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Mini Pro' ],
-		'SK17iv':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Mini Pro' ],
-		'SK17i-o':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Mini Pro' ],
-		'ST15a':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Mini' ],
-		'ST15i':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Mini' ],
-		'ST17a':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Active' ],
-		'ST17i':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Active' ],
-		'ST18a':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Ray' ],
-		'ST18i':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Ray' ],
-		'ST18iv':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Ray' ],
-		'ST18av':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Ray' ],
-		'SonyST21':									[ 'Sony', STRINGS_XPERIA + ' Tipo' ],
-		'SonyST21i':								[ 'Sony', STRINGS_XPERIA + ' Tipo' ],
-		'ST21':										[ 'Sony', STRINGS_XPERIA + ' Tipo' ],
-		'ST21i':									[ 'Sony', STRINGS_XPERIA + ' Tipo' ],
-		'SonyST21a2':								[ 'Sony', STRINGS_XPERIA + ' Tipo Dual' ],
-		'SonyST21i2':								[ 'Sony', STRINGS_XPERIA + ' Tipo Dual' ],
-		'SonyST23i':								[ 'Sony', STRINGS_XPERIA + ' Miro' ],
-		'ST23i':									[ 'Sony', STRINGS_XPERIA + ' Miro' ],
-		'ST25i':									[ 'Sony', STRINGS_XPERIA + ' U' ],
-		'SonyST26i':								[ 'Sony', STRINGS_XPERIA + ' J' ],
-		'ST27i':									[ 'Sony', STRINGS_XPERIA + ' Go' ],
-		'U20a':										[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10 Mini Pro' ],
-		'U20i':										[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10 Mini Pro' ],
-		'U20iv':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10 Mini Pro' ],
-		'WT13i':									[ STRINGS_SONY_ERICSSON, 'Mix Walkman' ],
-		'WT18i':									[ STRINGS_SONY_ERICSSON, 'Walkman' ],
-		'WT19a':									[ STRINGS_SONY_ERICSSON, 'Live with Walkman' ],
-		'WT19i':									[ STRINGS_SONY_ERICSSON, 'Live with Walkman' ],
-		'WT19iv':									[ STRINGS_SONY_ERICSSON, 'Live with Walkman' ],
-		'X8':										[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X8' ],
-		'X10':										[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10' ],
-		'X10a':										[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10' ],
-		'X10i':										[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10' ],
-		'X10iv':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10' ],
-		'X10S':										[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10' ],
-		'X10mini':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10 Mini' ],
-		'X10 Mini':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10 Mini' ],
-		'X10 Mini Pro':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10 Mini Pro' ],
-		'Z1i':										[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Play' ],
-		'S51SE':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Mini' ],
-		'IS11S':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Acro' ],
-		'IS12S':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Acro HD' ],
-		'SO-01B':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10' ],
-		'SO-01C':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc' ],
-		'SO-01D':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Play' ],
-		'SO-02C':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Acro' ],
-		'SO-02D':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' NX' ],
-		'SO-03C':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Ray' ],
-		'SO-03D':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Acro HD' ],
-		'SO-04D':									[ 'Sony', STRINGS_XPERIA + ' GX' ],
-		'SO-05D':									[ 'Sony', STRINGS_XPERIA + ' SX' ],
-		'SonySO-05D':								[ 'Sony', STRINGS_XPERIA + ' SX' ],
-		'XPERIA X8':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X8' ],
-		'Xperia X8':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X8' ],
-		'Xperia X10':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10' ],
-		'Xperia ray':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Ray' ],
-		'Xperia Ray':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Ray' ],
-		'Xperia Arc':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc' ],
-		'Xperia Arc S':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc S' ],
-		'Xperia Mini':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Mini' ],
-		'Xperia neo':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo' ],
-		'Xperia Neo':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo' ],
-		'XPERIA NEO':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo' ],
-		'Xperia NeoV':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo V' ],
-		'Xperia Neo V':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo V' ],
-		'Xperia Play':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Play' ],
-		'Xperia Pro':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Pro' ],
-		'Sony Ericsson Xperia X1':					[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X1' ],
-		'SonyHayabusa':								[ 'Sony', STRINGS_XPERIA + ' Ion' ],
-		'Hayabusa':									[ 'Sony', STRINGS_XPERIA + ' Ion' ],
-		'nozomi':									[ 'Sony', STRINGS_XPERIA + ' S' ],
-		'Sony Tablet P':							[ 'Sony', 'Tablet P', 'tablet' ],
-		'Sony Tablet S':							[ 'Sony', 'Tablet S', 'tablet' ],
-		'NWZ-Z1000Series':							[ 'Sony', 'Walkman Z', 'media' ],
-		'NW-Z1000Series':							[ 'Sony', 'Walkman Z', 'media' ],
-		'Spice Mi280':								[ 'Spice', 'Mi-280' ],
-		'Spice Mi300':								[ 'Spice', 'Mi-300' ],
-		'Spice Mi-310':								[ 'Spice', 'Mi-310' ],
-		'Spice Mi-355':								[ 'Spice', 'Mi-355' ],
-		'Spice Mi-425':								[ 'Spice', 'Mi-425' ],
-		'SPICE Mi-720':								[ 'Spice', 'Mi-720' ],
-		'A7272+':									[ 'Star', 'A7272+' ],
-		'e1109 v73 gq1002 ctp':						[ 'Star', 'X18i' ],
-		'TS1004T':									[ 'Surf 3Q', 'TS1004T', 'tablet' ],
-		'SYTABEX7-2':								[ 'Sylvania', 'SYTABEX7', 'tablet' ],
-		'KM-S200':									[ 'TAKE', 'Janus KM-S200' ],
-		'TCL A860':									[ 'TCL' , 'A860' ],
-		'TCL A906':									[ 'TCL' , 'A906' ],
-		'TCL A909':									[ 'TCL' , 'A909' ],
-		'TCL A919':									[ 'TCL' , 'A919' ],
-		'TCL A990':									[ 'TCL' , 'A990' ],
-		'TCL A996':									[ 'TCL' , 'A996' ],
-		'TCL A998':									[ 'TCL' , 'A998' ],
-		'TCL GENESEE E708':							[ 'TCL' , 'Genesee E708' ],
-		'A10t(5DM3)':								[ 'Teclast', 'A10T', 'tablet' ],
-		'P72':										[ 'Teclast', 'P72', 'tablet' ],
-		'P76TI':									[ 'Teclast', 'P76Ti', 'tablet' ],
-		'P81HD':									[ 'Teclast', 'P81HD', 'tablet' ],
-		'P85(R8A1)':								[ 'Teclast', 'P85', 'tablet' ],
-		'Teclast P85':								[ 'Teclast', 'P85', 'tablet' ],
-		'T720 SE':									[ 'Teclast', 'T720', 'tablet' ],
-		'T760 from moage.com':						[ 'Teclast', 'T760', 'tablet' ],
-		'tegav2':									[ 'Tegatech', 'TEGA v2', 'tablet' ],
-		'TM-7025':									[ 'teXet', 'TM-7025', 'tablet' ],
-		'MoFing':									[ 'Thomson', 'MoFing', 'tablet' ],
-		'Ultimate10':								[ 'Tomtec', 'Ultimate10', 'tablet' ],
-		'Thl V7':									[ 'THL', 'V7' ],
-		'ThL V7':									[ 'THL', 'V7' ],
-		'ThL V8':									[ 'THL', 'V8' ],
-		'ThL V9':									[ 'THL', 'V9' ],
-		'ThL V11':									[ 'THL', 'V11' ],
-		'TSB CLOUD COMPANION;TOSHIBA AC AND AZ':	[ STRINGS_TOSHIBA, 'Dynabook AZ', 'desktop' ],
-		'TOSHIBA AC AND AZ':						[ STRINGS_TOSHIBA, 'Dynabook AZ', 'desktop' ],
-		'TOSHIBA FOLIO AND A':						[ STRINGS_TOSHIBA, 'Folio 100', 'tablet' ],
-		'T-01C':									[ STRINGS_TOSHIBA, 'Regza T-01C' ],
-		'T-01D':									[ STRINGS_TOSHIBA, 'Regza T-01D' ],
-		'T-02D':									[ STRINGS_TOSHIBA, 'Regza T-02D' ],
-		'IS04':										[ STRINGS_TOSHIBA, 'Regza IS04' ],
-		'IS11T':									[ STRINGS_TOSHIBA, 'Regza IS11T' ],
-		'AT1S0':									[ STRINGS_TOSHIBA, 'Regza AT1S0' ],
-		'Tostab03':									[ STRINGS_TOSHIBA, 'Regza AT100', 'tablet' ],
-		'AT100':									[ STRINGS_TOSHIBA, 'Regza AT100', 'tablet' ],
-		'AT200':									[ STRINGS_TOSHIBA, 'Regza AT200', 'tablet' ],
-		'AT470':									[ STRINGS_TOSHIBA, 'Regza AT470', 'tablet' ],
-		'AT570':									[ STRINGS_TOSHIBA, 'Regza AT570', 'tablet' ],
-		'AT830':									[ STRINGS_TOSHIBA, 'Regza AT830', 'tablet' ],
-		'Folio 100':								[ STRINGS_TOSHIBA, 'Folio 100', 'tablet' ],
-		'folio100':									[ STRINGS_TOSHIBA, 'Folio 100', 'tablet' ],
-		'THRiVE':									[ STRINGS_TOSHIBA, 'THRiVE', 'tablet' ],
-		'Fantastic T3':								[ 'TWM', 'Fantastic T3' ],
-		'M70014':									[ 'United Star Technology', 'M70014', 'tablet' ],
-		'PS47':										[ 'Velocity Micro', 'Cruz PS47', 'tablet' ],
-		'T301':										[ 'Velocity Micro', 'Cruz T301', 'tablet' ],
-		'Vibo-A688':								[ 'FIH', 'Vibo A688' ],
-		'Videocon-V7500':							[ 'Videocon', 'V7500' ],
-		'GTablet':									[ 'ViewSonic', 'gTablet', 'tablet' ],
-		'GtabComb':									[ 'ViewSonic', 'gTablet', 'tablet' ],
-		'TeamDRH ICS for GTablet':					[ 'ViewSonic', 'gTablet', 'tablet' ],
-		'ViewPad7':									[ 'ViewSonic', 'ViewPad 7', 'tablet' ],
-		'ViewPad 10e':								[ 'ViewSonic', 'ViewPad 10e', 'tablet' ],
-		'VTAB1008':									[ 'Vizio', 'VTAB1008', 'tablet' ],
-		'VTAB3010':									[ 'Vizio', 'VTAB3010', 'tablet' ],
-		'VOTO W5300':								[ 'VOTO', 'W5300' ],
-		'xPAD-70':									[ 'WayteQ', 'xPAD-70', 'tablet' ],
-		'xTAB-70':									[ 'WayteQ', 'xTAB-70', 'tablet' ],
-		'WellcoM-A99':								[ 'WellcoM', 'A99' ],
-		'N12':										[ 'Window', 'N12', 'tablet' ],
-		'N12R':										[ 'Window', 'N12R', 'tablet' ],
-		'N50':										[ 'Window', 'N50', 'tablet' ],
-		'N50DT':									[ 'Window', 'N50DT', 'tablet' ],
-		'N50GT':									[ 'Window', 'N50GT', 'tablet' ],
-		'N50GT A':									[ 'Window', 'N50GT-A', 'tablet' ],
-		'N70':										[ 'Window', 'N70', 'tablet' ],
-		'N70 DUAL CORE':							[ 'Window', 'N70 Dual Core', 'tablet' ],
-		'N80':										[ 'Window', 'N80', 'tablet' ],
-		'N90':										[ 'Window', 'N90', 'tablet' ],
-		'N90 DUAL CORE2':							[ 'Window', 'N90 Dual Core', 'tablet' ],
-		'N90 DUAL CORE2 V12':						[ 'Window', 'N90 Dual Core', 'tablet' ],
-		'N612':										[ 'Wishway', 'N612' ],
-		'AT-AS43D':									[ 'Wolfgang', 'AT-AS43D' ],
-		'M12':										[ 'Wopad', 'M12', 'tablet' ],
-		'WM8650':									[ 'WonderMedia', 'WM8650', 'tablet' ],
-		'MI-ONE':									[ 'Xiaomi', 'MI-ONE' ],
-		'MI 1S':									[ 'Xiaomi', 'MI-ONE S' ],
-		'MI 1SC':									[ 'Xiaomi', 'MI-ONE SC' ],
-		'MI-ONE C1':								[ 'Xiaomi', 'MI-ONE C1' ],
-		'MI-ONE Plus':								[ 'Xiaomi', 'MI-ONE Plus' ],
-		'mione plus':								[ 'Xiaomi', 'MI-ONE Plus' ],
-		'MI-TWO':									[ 'Xiaomi', 'MI-TWO' ],
-		'Q07CL01':									[ 'XVision', 'Q07', 'tablet' ],
-		'N6':										[ 'Yarvik', '210 Tablet', 'tablet' ],
-		'EMR1879':									[ 'Yidong', 'EMR1879', 'tablet' ],
-		'yusun W702':								[ 'Yusun', 'W702' ],
-		'YX-YUSUN E80':								[ 'Yusun', 'E80' ],
-		'zt180':									[ 'Zenithink', 'ZT-180', 'tablet' ],
-		'Jaguar7':									[ 'ZiiLabs', 'Jaguar 7', 'tablet' ],
-		'Ziss Ranger HD':							[ 'Ziss', 'Ranger HD' ],
-		'ZTE Libra':								[ STRINGS_ZTE, 'Libra' ],
-		'ZTE-T T9':									[ STRINGS_ZTE, 'Light Tab T9', 'tablet' ],
-		'V9':										[ STRINGS_ZTE, 'Light Tab V9', 'tablet' ],
-		'V9e+':										[ STRINGS_ZTE, 'Light Tab 2', 'tablet' ],
-		'V9A':										[ STRINGS_ZTE, 'Light Tab 2', 'tablet' ],
-		'Light Tab 2W':								[ STRINGS_ZTE, 'Light Tab 2', 'tablet' ],
-		'Light Tab 2':								[ STRINGS_ZTE, 'Light Tab 2', 'tablet' ],
-		'V9C':										[ STRINGS_ZTE, 'Light Tab 3', 'tablet' ],
-		'V55':										[ STRINGS_ZTE, 'Optik', 'tablet' ],
-		'Acqua':									[ STRINGS_ZTE, 'Acqua' ],
-		'Blade':									[ STRINGS_ZTE, 'Blade' ],
-		'Blade-V880':								[ STRINGS_ZTE, 'Blade' ],
-		'ZTE-U V880':								[ STRINGS_ZTE, 'Blade' ],
-		'Blade-opda':								[ STRINGS_ZTE, 'Blade' ],
-		'ZTE-BLADE':								[ STRINGS_ZTE, 'Blade' ],
-		'ZTE Blade':								[ STRINGS_ZTE, 'Blade' ],
-		'ZTE V880':									[ STRINGS_ZTE, 'Blade' ],
-		'ZTE-U(V)880+':								[ STRINGS_ZTE, 'Blade' ],
-		'V880':										[ STRINGS_ZTE, 'Blade' ],
-		'a5':										[ STRINGS_ZTE, 'Blade' ],
-		'Blade2':									[ STRINGS_ZTE, 'Blade 2' ],
-		'Blade S':									[ STRINGS_ZTE, 'Blade S' ],
-		'X500':										[ STRINGS_ZTE, 'Score' ],
-		'ZTE-X500':									[ STRINGS_ZTE, 'Score' ],
-		'Skate':									[ STRINGS_ZTE, 'Skate' ],
-		'ZTE Skate':								[ STRINGS_ZTE, 'Skate' ],
-		'ZTE-Skate':								[ STRINGS_ZTE, 'Skate' ],
-		'ZTE-SKATE':								[ STRINGS_ZTE, 'Skate' ],
-		'ZTE-V960':									[ STRINGS_ZTE, 'Skate' ],
-		'ZTE-U V960':								[ STRINGS_ZTE, 'Skate' ],
-		'ZTE Racer':								[ STRINGS_ZTE, 'Racer' ],
-		'ZTE-RACER':								[ STRINGS_ZTE, 'Racer' ],
-		'MTC 916':									[ STRINGS_ZTE, 'Racer' ],
-		'Racer':									[ STRINGS_ZTE, 'Racer' ],
-		'RacerII':									[ STRINGS_ZTE, 'Racer 2' ],
-		'RACERII':									[ STRINGS_ZTE, 'Racer 2' ],
-		'ZTE Roamer':								[ STRINGS_ZTE, 'Roamer' ],
-		'N860':										[ STRINGS_ZTE, 'Warp' ],
-		'N880':										[ STRINGS_ZTE, 'Blade' ],
-		'ZTE-T U802':								[ STRINGS_ZTE, 'T-U802' ],
-		'ZTE-T U806':								[ STRINGS_ZTE, 'T-U806' ],
-		'ZTE-T U812':								[ STRINGS_ZTE, 'T-U812' ],
-		'ZTE-T U830':								[ STRINGS_ZTE, 'T-U830' ],
-		'ZTE-T U880':								[ STRINGS_ZTE, 'T-U880' ],
-		'ZTE T U880':								[ STRINGS_ZTE, 'T-U880' ],
-		'ZTE-TU880':								[ STRINGS_ZTE, 'T-U880' ],	
-		'ZTE-TU900':								[ STRINGS_ZTE, 'T-U900' ],	
-		'ZTE-T U960':								[ STRINGS_ZTE, 'T-U960' ],
-		'ZTE-TU960s':								[ STRINGS_ZTE, 'T-U960' ],
-		'ZTE-T U960s':								[ STRINGS_ZTE, 'T-U960' ],
-		'ZTE U N720':								[ STRINGS_ZTE, 'U-N720' ],
-		'ZTE-U V856':								[ STRINGS_ZTE, 'U-V856' ],
-		'ZTE-U V857':								[ STRINGS_ZTE, 'U-V857' ],
-		'ZTE-U V881':								[ STRINGS_ZTE, 'U-V881' ],
-		'ZTE-U X850':								[ STRINGS_ZTE, 'U-X850' ],
-		'ZTE-U X876':								[ STRINGS_ZTE, 'U-X876' ],
-		'ZTE-X876':									[ STRINGS_ZTE, 'U-X876' ],
-		'ZTE-C R750':								[ STRINGS_ZTE, 'C-R750' ],
-		'ZTE-C N600':								[ STRINGS_ZTE, 'C-N600' ],
-		'ZTE-C N600+':								[ STRINGS_ZTE, 'C-N600' ],
-		'ZTE-C N606':								[ STRINGS_ZTE, 'C-N606' ],
-		'ZTE-C N700':								[ STRINGS_ZTE, 'C-N700' ],
-		'ZTE-C N760':								[ STRINGS_ZTE, 'C-N760' ],
-		'ZTE-C N880':								[ STRINGS_ZTE, 'C-N880' ],
-		'ZTE-C N880S':								[ STRINGS_ZTE, 'C-N880' ],
-		'ZTE-C N880s':								[ STRINGS_ZTE, 'C-N880' ],
-		'ZTE-C X500':								[ STRINGS_ZTE, 'C-X500' ],
-		'ZTE-C X920':								[ STRINGS_ZTE, 'C-X920' ],
-		'ZXY-ZTE-C X920':							[ STRINGS_ZTE, 'C-X920' ],
-		'ZTE GV821':								[ STRINGS_ZTE, 'G-V821' ],
-		'ZTE N880E':								[ STRINGS_ZTE, 'N880E' ],
-		'ZTE-N880E':								[ STRINGS_ZTE, 'N880E' ],
-		'MIUI N880S':								[ STRINGS_ZTE, 'N880S' ],
-		'ZTE N882E':								[ STRINGS_ZTE, 'N882E' ],
-		'ZTE-N910':									[ STRINGS_ZTE, 'N910' ],
-		'E810':										[ STRINGS_ZTE, 'E810' ],
-		'u880':										[ STRINGS_ZTE, 'U880' ],
-		'ZTE U880E':								[ STRINGS_ZTE, 'U880E' ],
-		'U880':										[ STRINGS_ZTE, 'U880' ],
-		'ZTE U885':									[ STRINGS_ZTE, 'U885' ],
-		'ZTE U930':									[ STRINGS_ZTE, 'U930' ],
-		'ZTE U970':									[ STRINGS_ZTE, 'U970' ],
-		'ZTE V768':									[ STRINGS_ZTE, 'V768' ],
-		'ZTE V788D':								[ STRINGS_ZTE, 'V788' ],
-		'ZTE-V856':									[ STRINGS_ZTE, 'V856' ],
-		'ZTE V877b':								[ STRINGS_ZTE, 'V877' ],
-		'ZTE V889D':								[ STRINGS_ZTE, 'V889' ],
-		'ZTE V970':									[ STRINGS_ZTE, 'Z970' ],
-		'ZTE-Z990':									[ STRINGS_ZTE, 'Z990' ],
-		'ZTE-Z990G':								[ STRINGS_ZTE, 'Z990' ],
-		'003Z':										[ STRINGS_ZTE, 'Softbank 003Z' ],
-		'008Z':										[ STRINGS_ZTE, 'Softbank 008Z' ],
-		'009Z':										[ STRINGS_ZTE, 'Softbank Star7' ],
-
-		/* Telecom provider branded devices */
-		'i-mobile i691':							[ 'i-Mobile', 'i691' ],
-		'i-mobile i695':							[ 'i-Mobile', 'i695' ],
-		'i-mobile i858':							[ 'i-Mobile', 'i858' ],
-		'i-mobile 3G 8500':							[ 'i-Mobile', '3G 8500' ],
-		'i-mobile i-style Q1':						[ 'i-Mobile', 'i-Style Q1' ],						
-		'i-mobile i-STYLE Q2':						[ 'i-Mobile', 'i-Style Q2' ],						
-		'i-mobile I-Note':							[ 'i-Mobile', 'i-Note', 'tablet' ],
-
-		'Optimus Boston':							[ 'Optimus', 'Boston' ],							/* Gigabyte GSmart G1305 */
-		'Optimus San Francisco':					[ 'Optimus', 'San Francisco' ],						/* ZTE Blade */
-		'Optimus Monte Carlo':						[ 'Optimus', 'Monte Carlo' ],						/* ZTE Skate */
-		
-		'Orange Boston':							[ 'Orange', 'Boston' ],								/* Gigabyte GSmart G1305 */
-		'Orange Monte Carlo':						[ 'Orange', 'Monte Carlo' ],						/* ZTE Skate */
-		'San Francisco':							[ 'Orange', 'San Francisco' ],						/* ZTE Blade */
-		'San Francisco for Orange':					[ 'Orange', 'San Francisco' ],						/* ZTE Blade */
-		'Orange San Francisco':						[ 'Orange', 'San Francisco' ],						/* ZTE Blade */
-		
-		'MOVE':										[ 'T-Mobile', 'MOVE' ],								/* Alcatel One Touch 908 */
-		'T-Mobile G1':								[ 'T-Mobile', 'G1' ],								/* HTC Dream */
-		'T-Mobile G2':								[ 'T-Mobile', 'G2' ],								/* HTC Desire Z */
-		'T-Mobile G2 Touch':						[ 'T-Mobile', 'G2' ],								/* HTC Desire Z */
-		'LG-P999':									[ 'T-Mobile', 'G2x' ],								/* LG Optimus 2X */
-		'LG-E739':									[ 'T-Mobile', 'myTouch' ],							/* LG E739 */
-		'T-Mobile myTouch 3G':						[ 'T-Mobile', 'myTouch 3G'],						/* HTC Magic */
-		'T-Mobile myTouch 3G Slide':				[ 'T-Mobile', 'myTouch 3G Slide' ],					/* HTC Espresso */
-		'T-Mobile Espresso':						[ 'T-Mobile', 'myTouch 3G Slide' ],					/* HTC Espresso */
-		'HTC myTouch 3G Slide':						[ 'T-Mobile', 'myTouch 3G Slide' ],					/* HTC Espresso */
-		'T-Mobile myTouch 4G':						[ 'T-Mobile', 'myTouch 4G' ],						/* HTC Glacier */
-		'HTC Glacier':								[ 'T-Mobile', 'myTouch 4G' ],						/* HTC Glacier */
-		'HTC Panache':								[ 'T-Mobile', 'myTouch 4G' ],						/* HTC Glacier */
-		'myTouch4G':								[ 'T-Mobile', 'myTouch 4G' ],						/* HTC Glacier */
-		'My Touch 4G':								[ 'T-Mobile', 'myTouch 4G' ],						/* HTC Glacier */
-		'HTC Mytouch 4G':							[ 'T-Mobile', 'myTouch 4G' ],						/* HTC Glacier */
-		'HTC My Touch 4G':							[ 'T-Mobile', 'myTouch 4G' ],						/* HTC Glacier */
-		'HTC mytouch4g':							[ 'T-Mobile', 'myTouch 4G' ],						/* HTC Glacier */
-		'HTC myTouch 4G Slide':						[ 'T-Mobile', 'myTouch 4G Slide' ],					/* HTC Doubleshot */
-		'myTouch 4G Slide':							[ 'T-Mobile', 'myTouch 4G Slide' ],					/* HTC Doubleshot */
-		'T-Mobile myTouch Q':						[ 'T-Mobile', 'myTouch Q' ],						/* Huawei U8730 */
-		'LG-C800':									[ 'T-Mobile', 'myTouch Q' ],
-		'Pulse Mini':								[ 'T-Mobile', 'Pulse Mini' ],						/* Huawei U8110 */
-		
-		'Vodafone 845':								[ 'Vodafone', '845 Nova' ],							/* Huawei U8100 */
-		'Vodafone 858':								[ 'Vodafone', '858 Smart' ],						/* Huawei U8160 */
-		'Vodafone 945':								[ 'Vodafone', '945' ],								/* ZTE Joe */
-		'Vodafone Smart II':						[ 'Vodafone', 'Smart II' ],
-		'SmartTab10':								[ 'Vodafone', 'SmartTab 10', 'tablet' ]				/* ZTE Web Tab 10 */
-	};
+		var WINDOWS_MOBILE_MODELS = {
+			'DX900':									[ STRINGS_ACER, 'Tempo DX900' ],
+			'F900':										[ STRINGS_ACER, 'Tempo F900' ],
+			'Coolpad F800':								[ STRINGS_COOLPAD, 'F800' ],
+			'garmin-asus-Nuvifone-M10':					[ 'Garmin-Asus', 'Nuvifone M10' ],
+			'HP iPAQ 510':								[ 'HP', 'iPAQ 510' ],
+			'((HTC )?HD mini|.*T5555)!':				[ STRINGS_HTC, 'HD mini' ],
+			'((HTC )?HD2|.*T8585)!':					[ STRINGS_HTC, 'HD2' ],
+			'T-Mobile LEO':								[ STRINGS_HTC, 'HD2' ],
+			'dopodT5588':								[ STRINGS_HTC, 'Hengshan' ],
+			'(HTC Mega|.*T3333)!':						[ STRINGS_HTC, 'Mega' ],
+			'(HTC Snap|.*S521)!':						[ STRINGS_HTC, 'Snap' ],
+			'(HTC Touch2|.*T33(20|33|35))!':			[ STRINGS_HTC, 'Touch 2' ],
+			'(HTC Touch Diamond2|.*T5353)!':			[ STRINGS_HTC, 'Touch Diamond 2' ],
+			'(HTC Touch Diamond|.*P3700)!':				[ STRINGS_HTC, 'Touch Diamond' ],
+			'(HTC Touch HD2|.*T8585)!':					[ STRINGS_HTC, 'Touch HD2' ],
+			'(HTC Touch HD|.*T82(82|83))!':				[ STRINGS_HTC, 'Touch HD' ],
+			'(HTC Touch Pro2|.*T73(73|80))!':			[ STRINGS_HTC, 'Touch Pro 2' ],
+			'HTC TyTN II':								[ STRINGS_HTC, 'TyTN II' ],
+			'GT-B7300':									[ STRINGS_SAMSUNG, 'Omnia Lite' ],
+			'GT-B7610':									[ STRINGS_SAMSUNG, 'Omnia Pro' ],
+			'GT-I8000!':								[ STRINGS_SAMSUNG, 'Omnia 2' ],
+			'M1i': 										[ STRINGS_SONY_ERICSSON, 'M1i Aspen' ]
+		}		
+
+		var WINDOWS_PHONE_MODELS = {
+			'Allegro':									[ STRINGS_ACER, 'Allegro' ],
+			'M310':										[ STRINGS_ACER, 'Allegro' ],
+			'Galaxy6':									[ STRINGS_ASUS, 'Galaxy 6' ],
+			'Venue Pro':								[ 'Dell', 'Venue Pro' ],
+			'IS12T':									[ 'Fujitsu Toshiba', 'IS12T' ],
+			'USCCHTC-PC93100':							[ STRINGS_HTC, 'Arrive' ],
+			'Gold':										[ STRINGS_HTC, 'Gold' ],
+			'HD2':										[ STRINGS_HTC, 'HD2' ],
+			'(HD7|.*T92(92|95|96))!':					[ STRINGS_HTC, 'HD7' ],
+			'(7 Pro|.*T75(75|76))!':					[ STRINGS_HTC, '7 Pro' ],
+			'((7 )?Mozart|.*T86(97|98))!':				[ STRINGS_HTC, '7 Mozart' ],
+			'PD67100':									[ STRINGS_HTC, '7 Mozart' ], 
+			'((7 )?Trophy|.*T8686)!':					[ STRINGS_HTC, 'Trophy' ],
+			'mwp6985':									[ STRINGS_HTC, 'Trophy' ],
+			'PC40100':									[ STRINGS_HTC, 'Trophy' ],
+			'Touch-IT Trophy':							[ STRINGS_HTC, 'Trophy' ],
+			'(Radar|.*C110e)!':							[ STRINGS_HTC, 'Radar' ],
+			'Mazaa':									[ STRINGS_HTC, 'Mazaa' ], 
+			'Mondrian':									[ STRINGS_HTC, 'Mondrian' ],
+			'(Schubert|.*T9292)!':						[ STRINGS_HTC, 'Schubert' ],
+			'Spark':									[ STRINGS_HTC, 'Spark' ],
+			'.*T8788!':									[ STRINGS_HTC, 'Surround' ],
+			'.*X310e!':									[ STRINGS_HTC, 'Titan' ],
+			'PI39100':									[ STRINGS_HTC, 'Titan' ],
+			'PI86100':									[ STRINGS_HTC, 'Titan II' ],
+			'Ultimate':									[ STRINGS_HTC, 'Ultimate' ],
+			'HUAWEI Ascend W1!':						[ STRINGS_HUAWEI, 'Ascend W1' ],
+			'GW910':									[ STRINGS_LG, 'Optimus 7' ],
+			'LG-E-?900!':								[ STRINGS_LG, 'Optimus 7 E900' ],
+			'LG-E906':									[ STRINGS_LG, 'Jil Sander' ],
+			'LG-C900!':									[ STRINGS_LG, 'Optimus 7Q' ],
+			'Lumia 610':								[ 'Nokia', 'Lumia 610' ],
+			'(Lumia |Nokia )?710!':						[ 'Nokia', 'Lumia 710' ],
+			'Lumia 719':								[ 'Nokia', 'Lumia 719' ],
+			'(Lumia |Nokia )?800!':						[ 'Nokia', 'Lumia 800' ],
+			'SeaRay':									[ 'Nokia', 'Lumia 800' ],
+			'Lumia 900':								[ 'Nokia', 'Lumia 900' ],
+			'XXX':										[ 'Nokia', 'prototype' ],
+			'GT-I8350!':								[ STRINGS_SAMSUNG, 'Omnia W' ],
+			'SGH-i677':									[ STRINGS_SAMSUNG, 'Focus Flash' ],
+			'SGH-i707':									[ STRINGS_SAMSUNG, 'Taylor' ],
+			'SGH-i917!':								[ STRINGS_SAMSUNG, 'Focus' ],
+			'SGH-i937':									[ STRINGS_SAMSUNG, 'Focus S' ],
+			'OM(NI|IN)A7!':								[ STRINGS_SAMSUNG, 'Omnia 7' ],
+			'Taylor':									[ STRINGS_SAMSUNG, 'Taylor' ],
+			'TSUNAGI':									[ 'Toshiba', 'Tsunagi' ]
+		};
+		
+		var BLACKBERRY_MODELS = {
+			'9600':			'Bold',
+			'9650':			'Bold',
+			'9700':			'Bold',
+			'9780':			'Bold',
+			'9790':			'Bold',
+			'9900':			'Bold',
+			'9930':			'Bold',
+			'8300':			'Curve',
+			'8310':			'Curve',
+			'8320':			'Curve',
+			'8330':			'Curve',
+			'8350i':		'Curve',
+			'8520':			'Curve',
+			'8530':			'Curve',
+			'8900':			'Curve',
+			'9220':			'Curve',
+			'9300':			'Curve',
+			'9310':			'Curve',
+			'9320':			'Curve',
+			'9330':			'Curve',
+			'9350':			'Curve',
+			'9360':			'Curve',
+			'9370':			'Curve',
+			'9380':			'Curve',
+			'8100':			'Pearl',
+			'8110':			'Pearl',
+			'8120':			'Pearl',
+			'8130':			'Pearl',
+			'8220':			'Pearl',
+			'8230':			'Pearl',
+			'9100':			'Pearl',
+			'9105':			'Pearl',
+			'9530':			'Storm',
+			'9550':			'Storm',
+			'9670':			'Style',
+			'9800':			'Torch',
+			'9810':			'Torch',
+			'9850':			'Torch',
+			'9860':			'Torch',
+			'9630':			'Tour',
+			'9981':			'Porsche P'
+		};
+				
+		return DeviceModels;
+	})();
+	
 	
-	var BLACKBERRY_MODELS = {
-		'9600':			'Bold',
-		'9650':			'Bold',
-		'9700':			'Bold',
-		'9780':			'Bold',
-		'9790':			'Bold',
-		'9900':			'Bold',
-		'9930':			'Bold',
-		'8300':			'Curve',
-		'8310':			'Curve',
-		'8320':			'Curve',
-		'8330':			'Curve',
-		'8350i':		'Curve',
-		'8520':			'Curve',
-		'8530':			'Curve',
-		'8900':			'Curve',
-		'9220':			'Curve',
-		'9300':			'Curve',
-		'9330':			'Curve',
-		'9350':			'Curve',
-		'9360':			'Curve',
-		'9370':			'Curve',
-		'9380':			'Curve',
-		'8100':			'Pearl',
-		'8110':			'Pearl',
-		'8120':			'Pearl',
-		'8130':			'Pearl',
-		'8220':			'Pearl',
-		'8230':			'Pearl',
-		'9100':			'Pearl',
-		'9105':			'Pearl',
-		'9530':			'Storm',
-		'9550':			'Storm',
-		'9670':			'Style',
-		'9800':			'Torch',
-		'9810':			'Torch',
-		'9850':			'Torch',
-		'9860':			'Torch',
-		'9630':			'Tour',
-		'9981':			'Porsche P'
-	};
-
 	
  	var Version = function() { this.initialize.apply(this, Array.prototype.slice.call(arguments)) };
 	Version.prototype = {
@@ -2679,23 +2212,6 @@ var UserAgents = (function(){
 			this.features = [];
 			
 			this.detect(ua);
-
-
-			this.Android = this.engine.name != 'Presto' && this.engine.name != 'Gecko' && this.os.name == 'Android' ? (typeof this.os.version != 'undefined' ? 0 + this.os.version : true): false;
-			this.iOS = this.engine.name != 'Presto' && this.os.name == 'iOS' ? (typeof this.os.version != 'undefined' ? 0 + this.os.version : true): false;
-			this.WindowsPhone = this.os.name == 'Windows Phone' ? (typeof this.os.version != 'undefined' ? 0 + this.os.version : true): false;
-			this.BlackBerry = this.os.name == 'BlackBerry' || this.os.name == 'BlackBerry OS' || this.os.name == 'BlackBerry Tablet OS' ? (typeof this.os.version != 'undefined' ? 0 + this.os.version : true): false;
-			this.Meego = this.os.name == 'Meego' ? (typeof this.os.version != 'undefined' ? 0 + this.os.version : true): false;
-
-			this.Presto = this.engine.name == 'Presto' ? (typeof this.engine.version != 'undefined' ? 0 + this.engine.version : true): false;
-			this.Opera = this.engine.name == 'Presto' ? (typeof this.browser.version != 'undefined' ? 0 + this.browser.version : true): false;
-			this.Firefox = this.engine.name == 'Gecko' ? (typeof this.browser.version != 'undefined' ? 0 + this.browser.version : true): false;
-			this.Chrome = this.browser.name == 'Chrome' || this.browser.name == 'Chrome Frame' || this.browser.name == 'Chromium' ? (typeof this.browser.version != 'undefined' ? 0 + this.browser.version : true): false;
-
-			this.desktop = this.device.type == 'desktop';
-			this.tablet = this.device.type == 'tablet';
-			this.mobile = this.device.type == 'mobile';
-			this.proxy = this.device.type == 'proxy';
 		},
 		
 		isX: function() {
@@ -2886,12 +2402,12 @@ var UserAgents = (function(){
 					this.device.model = 'iPod Touch';
 				} 
 				else if (ua.match('iPhone;')) {
-					this.device.type = 'mobile';
+					this.device.type = TYPE_MOBILE;
 					this.device.manufacturer = 'Apple';
 					this.device.model = 'iPhone';
 				} 
 				else {
-					this.device.type = 'tablet';
+					this.device.type = TYPE_TABLET;
 					this.device.manufacturer = 'Apple';
 					this.device.model = 'iPad';
 				}
@@ -2922,7 +2438,12 @@ var UserAgents = (function(){
 					this.os.version = parseVersion(match[1]);
 					
 					switch(match[1]) {
-						case '6.2':		this.os.version = new Version({ value: match[1], alias: '8' }); break;
+						case '6.2':		if (ua.match('; ARM;')) 
+											this.os.version = new Version({ value: match[1], alias: 'RT' }); 
+										else
+											this.os.version = new Version({ value: match[1], alias: '8' }); 
+										break;
+										
 						case '6.1':		this.os.version = new Version({ value: match[1], alias: '7' }); break;
 						case '6.0':		this.os.version = new Version({ value: match[1], alias: 'Vista' }); break;
 						case '5.2':		this.os.version = new Version({ value: match[1], alias: 'Server 2003' }); break;
@@ -2948,16 +2469,16 @@ var UserAgents = (function(){
 					this.os.name = new Version({ value: '5.1', alias: 'XP' });
 				}
 
-				if (ua.match('Windows NT 6.2') && ua.match('; ARM;')) {
+				if (ua.match('WPDesktop')) {
 					this.os.name = 'Windows Phone';
-					this.os.version = new Version({ value: '8', details: 1 });
-					this.device.type = 'mobile';
+					this.os.version = new Version({ value: '8.0', details: 2 });
+					this.device.type = TYPE_MOBILE;
 				}
 				
 				if (ua.match('WP7')) {
 					this.os.name = 'Windows Phone';
 					this.os.version = new Version({ value: '7', details: 1 });
-					this.device.type = 'mobile';
+					this.device.type = TYPE_MOBILE;
 					this.browser.mode = 'desktop';
 				}
 
@@ -2989,24 +2510,29 @@ var UserAgents = (function(){
 						}
 					}
 										
-					this.device.type = 'mobile';
+					this.device.type = TYPE_MOBILE;
 				}
 
 				if (ua.match('Windows Mobile')) {
 					this.os.name = 'Windows Mobile';
-					this.device.type = 'mobile';
+					this.device.type = TYPE_MOBILE;
 				}
 				
 				if (match = /WindowsMobile\/([0-9.]*)/.exec(ua)) {
 					this.os.name = 'Windows Mobile';
 					this.os.version = new Version({ value: match[1], details: 2 });
-					this.device.type = 'mobile';
+					this.device.type = TYPE_MOBILE;
 				}
 				
-				if (ua.match('Windows Phone [0-9]')) {
-					this.os.name = 'Windows Mobile';
-					this.os.version = new Version({ value: ua.match(/Windows Phone ([0-9.]*)/)[1], details: 2 });
-					this.device.type = 'mobile';
+				if (match = /Windows Phone ([0-9.]*)/.exec(ua)) {
+					if (parseInt(match[1], 10) < 7) {
+	 					this.os.name = 'Windows Mobile';
+					} else {
+						this.os.name = 'Windows Phone';
+					}
+	
+					this.os.version = new Version({ value: match[1], details: 2 });
+					this.device.type = TYPE_MOBILE;
 				}
 				
 				if (ua.match('Windows Phone OS')) {
@@ -3018,24 +2544,15 @@ var UserAgents = (function(){
 					}
 
 					if (match = /IEMobile\/[^;]+; ([^;]+); ([^;]+)[;|\)]/.exec(ua)) {
-						this.device.manufacturer = match[1];
-						this.device.model = match[2];
+						this.device = DeviceModels.identify('wp', match[2]);
+						
+						if (!this.device.identified) {
+							this.device.manufacturer = match[1];
+							this.device.model = match[2];
+						}
 					}						
 
-					this.device.type = 'mobile';
-										
-					var manufacturer = this.device.manufacturer;
-					var model = cleanupModel(this.device.model);
-
-					if (typeof WINDOWS_PHONE_MODELS[manufacturer] != 'undefined' && 
-						typeof WINDOWS_PHONE_MODELS[manufacturer][model] != 'undefined') 
-					{
-						this.device.manufacturer = WINDOWS_PHONE_MODELS[manufacturer][model][0];
-						this.device.model = WINDOWS_PHONE_MODELS[manufacturer][model][1];
-						this.device.identified = true;
-					}
-					
-					if (manufacturer == 'Microsoft' && model == 'XDeviceEmulator') {
+					if (this.device.manufacturer == 'Microsoft' && this.device.model == 'XDeviceEmulator') {
 						this.device.manufacturer = null;
 						this.device.model = null;
 						this.device.type = 'emulator';
@@ -3073,9 +2590,9 @@ var UserAgents = (function(){
 				}
 					
 
-				this.device.type = 'mobile';
-				if (this.os.version >= 3) this.device.type = 'tablet';
-				if (this.os.version >= 4 && ua.match('Mobile')) this.device.type = 'mobile';
+				this.device.type = TYPE_MOBILE;
+				if (this.os.version >= 3) this.device.type = TYPE_TABLET;
+				if (this.os.version >= 4 && ua.match(TYPE_MOBILE)) this.device.type = TYPE_MOBILE;
 
 				if (match = /Eclair; (?:[a-zA-Z][a-zA-Z](?:[-_][a-zA-Z][a-zA-Z])?) Build\/([^\/]*)\//.exec(ua)) {
 				    this.device.model = match[1];
@@ -3110,24 +2627,10 @@ var UserAgents = (function(){
 				}
 				
 				if (this.device.model) {
-					var model = cleanupModel(this.device.model);
-
-					if (typeof ANDROID_MODELS[model] != 'undefined') {
-						this.device.manufacturer = ANDROID_MODELS[model][0];
-						this.device.model = ANDROID_MODELS[model][1];
-						if (typeof ANDROID_MODELS[model][2] != 'undefined') this.device.type = ANDROID_MODELS[model][2];
-						this.device.identified = true;
-					}
-
-					if (model == 'Emulator' || model == 'x86 Emulator' || model == 'x86 VirtualBox' || model == 'vm') {
-						this.device.manufacturer = null;
-						this.device.model = null;
-						this.device.type = 'emulator';
-						this.device.identified = true;
-					}
+					this.device = DeviceModels.identify('android', this.device.model);
 				}
 				
-				if (ua.match('HP eStation'))	{ this.device.manufacturer = 'HP'; this.device.model = 'eStation'; this.device.type = 'tablet'; this.device.identified = true; }
+				if (ua.match('HP eStation'))	{ this.device.manufacturer = 'HP'; this.device.model = 'eStation'; this.device.type = TYPE_TABLET; this.device.identified = true; }
 				if (ua.match('Pre\/1.0')) 		{ this.device.manufacturer = 'Palm'; this.device.model = 'Pre'; this.device.identified = true; }
 				if (ua.match('Pre\/1.1')) 		{ this.device.manufacturer = 'Palm'; this.device.model = 'Pre Plus'; this.device.identified = true; }
 				if (ua.match('Pre\/1.2')) 		{ this.device.manufacturer = 'Palm'; this.device.model = 'Pre 2'; this.device.identified = true; }
@@ -3144,7 +2647,7 @@ var UserAgents = (function(){
 			 */
 		
 			if (ua.match('Aliyun')) {
-				this.device.type = 'mobile';
+				this.device.type = TYPE_MOBILE;
 
 				this.os.name = 'Aliyun OS';
 				this.os.version = null;
@@ -3162,14 +2665,7 @@ var UserAgents = (function(){
 				}		
 
 				if (this.device.model) {
-					var model = cleanupModel(this.device.model);
-
-					if (typeof ANDROID_MODELS[model] != 'undefined') {
-						this.device.manufacturer = ANDROID_MODELS[model][0];
-						this.device.model = ANDROID_MODELS[model][1];
-						if (typeof ANDROID_MODELS[model][2] != 'undefined') this.device.type = ANDROID_MODELS[model][2];
-						this.device.identified = true;
-					}
+					this.device = DeviceModels.identify('android', this.device.model);
 				}
 			}
 
@@ -3202,7 +2698,7 @@ var UserAgents = (function(){
 					this.os.version = new Version({ value: '2' });
 				}
 
-				this.device.type = 'television';
+				this.device.type = TYPE_TELEVISION;
 			}
 
 			/****************************************************
@@ -3216,7 +2712,7 @@ var UserAgents = (function(){
 				    this.os.version = new Version({ value: match[1] });
 				}					
 
-				this.device.type = 'mobile';
+				this.device.type = TYPE_MOBILE;
 			}
 
 			/****************************************************
@@ -3245,11 +2741,7 @@ var UserAgents = (function(){
 					}
 					
 					if (typeof this.device.model != 'undefined') {
-						if (typeof BLACKBERRY_MODELS[this.device.model] != 'undefined') {
-							this.device.model = 'BlackBerry ' + BLACKBERRY_MODELS[this.device.model] + ' ' + this.device.model;
-						} else {
-							this.device.model = 'BlackBerry ' + this.device.model;
-						}
+						this.device.model = DeviceModels.identify('blackberry', this.device.model);
 					} else {
 						this.device.model = 'BlackBerry';
 					}
@@ -3258,7 +2750,7 @@ var UserAgents = (function(){
 				}
 
 				this.device.manufacturer = 'RIM';
-				this.device.type = 'mobile';
+				this.device.type = TYPE_MOBILE;
 				this.device.identified = true;
 			}
 			
@@ -3268,7 +2760,7 @@ var UserAgents = (function(){
 
 				this.device.manufacturer = 'RIM';
 				this.device.model = 'BlackBerry ' + match[2];
-				this.device.type = ua.match('Mobile') ? 'mobile' : 'tablet';
+				this.device.type = ua.match('Mobile') ? TYPE_MOBILE : TYPE_TABLET;
 				this.device.identified = true;
 
 				if (match = /Version\/([0-9.]*)/.exec(ua)) {
@@ -3286,7 +2778,7 @@ var UserAgents = (function(){
 
 				this.device.manufacturer = 'RIM';
 				this.device.model = 'BlackBerry PlayBook';
-				this.device.type = 'tablet';
+				this.device.type = TYPE_TABLET;
 				this.device.identified = true;
 			}
 
@@ -3297,7 +2789,7 @@ var UserAgents = (function(){
 
 					this.device.manufacturer = 'RIM';
 					this.device.model = 'BlackBerry PlayBook';
-					this.device.type = 'tablet';
+					this.device.type = TYPE_TABLET;
 					this.device.identified = true;
 				}
 			}
@@ -3310,10 +2802,10 @@ var UserAgents = (function(){
 				this.os.name = 'webOS';
 				this.os.version = new Version({ value: ua.match(/(?:web|hpw)OS\/([0-9.]*)/)[1] });
 
-				if (ua.match('tablet')) 
-					this.device.type = 'tablet';
+				if (ua.match(TYPE_TABLET)) 
+					this.device.type = TYPE_TABLET;
 				else
-					this.device.type = 'mobile';
+					this.device.type = TYPE_MOBILE;
 
 				this.device.manufacturer = ua.match('hpwOS') ? 'HP' : 'Palm';
 				if (ua.match('Pre\/1.0')) this.device.model = 'Pre';
@@ -3375,7 +2867,7 @@ var UserAgents = (function(){
 					this.device.identified = true;
 				}
 
-				this.device.type = 'mobile';
+				this.device.type = TYPE_MOBILE;
 			}
 				
 			/****************************************************
@@ -3391,7 +2883,7 @@ var UserAgents = (function(){
 					this.device.identified = true;
 				}
 
-				this.device.type = 'mobile';
+				this.device.type = TYPE_MOBILE;
 			}
 			
 			/****************************************************
@@ -3400,7 +2892,7 @@ var UserAgents = (function(){
 		
 			if (ua.match('MeeGo')) {
 				this.os.name = 'MeeGo';
-				this.device.type = 'mobile';
+				this.device.type = TYPE_MOBILE;
 
 				if (match = /Nokia([^\)]+)\)/.exec(ua)) {
 					this.device.manufacturer = 'Nokia';
@@ -3415,7 +2907,7 @@ var UserAgents = (function(){
 		
 			if (ua.match('Maemo')) {
 				this.os.name = 'Maemo';
-				this.device.type = 'mobile';
+				this.device.type = TYPE_MOBILE;
 
 				if (match = /(N[0-9]+)/.exec(ua)) {
 					this.device.manufacturer = 'Nokia';
@@ -3435,22 +2927,15 @@ var UserAgents = (function(){
 					this.os.version = new Version({ value: match[1] });
 				}
 
-				this.device.type = 'mobile';
+				this.device.type = TYPE_MOBILE;
 
 				if (match = /\(([^;]+); ([^\/]+)\//.exec(ua)) {
 					if (match[1] != 'Linux') {
-						this.device.manufacturer = match[1];
-						this.device.model = match[2];
-	
-						if (typeof TIZEN_MODELS[this.device.manufacturer] != 'undefined' && 
-							typeof TIZEN_MODELS[this.device.manufacturer][this.device.model] != 'undefined') 
-						{
-							var manufacturer = this.device.manufacturer;
-							var model = cleanupModel(this.device.model);
-							
-							this.device.manufacturer = TIZEN_MODELS[manufacturer][model][0];
-							this.device.model = TIZEN_MODELS[manufacturer][model][1];
-							this.device.identified = true;
+						this.device = DeviceModels.identify('tizen', match[2]);
+
+						if (!this.device.identified) {
+							this.device.manufacturer = match[1];
+							this.device.model = match[2];
 						}
 					}						
 				}
@@ -3467,22 +2952,15 @@ var UserAgents = (function(){
 					this.os.version = new Version({ value: match[1] });
 				}
 
-				this.device.type = 'mobile';
+				this.device.type = TYPE_MOBILE;
 
 				if (match = /\(([^;]+); ([^\/]+)\//.exec(ua)) {
-					this.device.manufacturer = match[1];
-					this.device.model = cleanupModel(match[2]);
-				}						
-
-				if (typeof BADA_MODELS[this.device.manufacturer] != 'undefined' && 
-					typeof BADA_MODELS[this.device.manufacturer][this.device.model] != 'undefined') 
-				{
-					var manufacturer = this.device.manufacturer;
-					var model = cleanupModel(this.device.model);
+					this.device = DeviceModels.identify('bada', match[2]);
 					
-					this.device.manufacturer = BADA_MODELS[manufacturer][model][0];
-					this.device.model = BADA_MODELS[manufacturer][model][1];
-					this.device.identified = true;
+					if (!this.device.identified) {
+					    this.device.manufacturer = match[1];
+					    this.device.model = match[2];
+					}
 				}
 			}
 			
@@ -3492,7 +2970,7 @@ var UserAgents = (function(){
 		
 			if (ua.match(/BREW/i) || ua.match('BMP; U')) {
 				this.os.name = 'Brew';
-				this.device.type = 'mobile';
+				this.device.type = TYPE_MOBILE;
 
 				if (match = /BREW; U; ([0-9.]*)/i.exec(ua)) {
 					this.os.version = new Version({ value: match[1] });
@@ -3504,16 +2982,10 @@ var UserAgents = (function(){
 
 				
 				if (match = /\(([^;]+);U;REX\/[^;]+;BREW\/[^;]+;(?:.*;)?[0-9]+\*[0-9]+;CTC\/2.0\)/.exec(ua)) {
-				    this.device.model = match[1];
-				}
-
-				if (this.device.model) {
-					var model = cleanupModel(this.device.model);
-
-					if (typeof BREW_MODELS[model] != 'undefined') {
-						this.device.manufacturer = BREW_MODELS[model][0];
-						this.device.model = BREW_MODELS[model][1];
-						this.device.identified = true;
+					this.device = DeviceModels.identify('bada', match[1]);
+					
+					if (!this.device.identified) {
+					    this.device.model = match[1];
 					}
 				}
 			}			
@@ -3524,7 +2996,7 @@ var UserAgents = (function(){
 		
 			if (ua.match(/\(MTK;/)) {
 				this.os.name = 'MTK';
-				this.device.type = 'mobile';
+				this.device.type = TYPE_MOBILE;
 			}			
 
 			/****************************************************
@@ -3564,7 +3036,7 @@ var UserAgents = (function(){
 		
 			if (ua.match('QNX')) {
 				this.os.name = 'QNX';
-				this.device.type = 'mobile';
+				this.device.type = TYPE_MOBILE;
 			}			
 			
 			/****************************************************
@@ -3586,7 +3058,7 @@ var UserAgents = (function(){
 		
 			if (ua.match('Grid OS')) {
 				this.os.name = 'Grid OS';
-				this.device.type = 'tablet';
+				this.device.type = TYPE_TABLET;
 
 				if (match = /Grid OS ([0-9.]*)/i.exec(ua)) {
 					this.os.version = new Version({ value: match[1] });
@@ -3630,7 +3102,7 @@ var UserAgents = (function(){
 
 				this.device.manufacturer = 'Amazon';
 				this.device.model = 'Kindle';
-				this.device.type = 'ereader';
+				this.device.type = TYPE_EREADER;
 
 				if (ua.match('Kindle\/2.0')) this.device.model = 'Kindle 2';
 				if (ua.match('Kindle\/3.0')) this.device.model = 'Kindle 3 or later';
@@ -3647,7 +3119,7 @@ var UserAgents = (function(){
 				
 				this.device.manufacturer = 'Barnes & Noble';
 				this.device.model = 'NOOK';
-				this.device.type = 'ereader';
+				this.device.type = TYPE_EREADER;
 				this.device.identified = true;
 			}
 			
@@ -3660,7 +3132,7 @@ var UserAgents = (function(){
 				
 				this.device.manufacturer = 'Bookeen';
 				this.device.model = 'Cybook';
-				this.device.type = 'ereader';
+				this.device.type = TYPE_EREADER;
 				
 				if (ua.match('Orizon')) {
 					this.device.model = 'Cybook Orizon';
@@ -3678,7 +3150,7 @@ var UserAgents = (function(){
 				
 				this.device.manufacturer = 'Sony';
 				this.device.model = 'Reader';
-				this.device.type = 'ereader';
+				this.device.type = TYPE_EREADER;
 				this.device.identified = true;
 			}
 			
@@ -3691,7 +3163,7 @@ var UserAgents = (function(){
 				
 				this.device.manufacturer = 'iRiver';
 				this.device.model = 'Story';
-				this.device.type = 'ereader';
+				this.device.type = TYPE_EREADER;
 				
 				if (ua.match('EB07')) {
 					this.device.model = 'Story HD EB07';
@@ -3720,7 +3192,7 @@ var UserAgents = (function(){
 				this.device.identified = true;
 			}
 			
-			if (ua.match('Nintendo WiiU')) {
+			if (ua.match('Nintendo Wii ?U')) {
 				this.os.name = '';
 
 				this.device.manufacturer = 'Nintendo';
@@ -3838,7 +3310,7 @@ var UserAgents = (function(){
 				this.os.name = '';
 				this.device.manufacturer = 'Panasonic';
 				this.device.model = 'Smart Viera';
-				this.device.type = 'television';
+				this.device.type = TYPE_TELEVISION;
 				this.device.identified = true;
 			}
 
@@ -3855,7 +3327,7 @@ var UserAgents = (function(){
 				this.os.name = '';
 				this.device.manufacturer = STRINGS_SHARP;
 				this.device.model = 'Aquos TV';
-				this.device.type = 'television';
+				this.device.type = TYPE_TELEVISION;
 				this.device.identified = true;
 			}
 
@@ -3871,7 +3343,7 @@ var UserAgents = (function(){
 				this.os.name = '';
 				this.device.manufacturer = STRINGS_SAMSUNG;
 				this.device.model = 'Smart TV';
-				this.device.type = 'television';
+				this.device.type = TYPE_TELEVISION;
 				this.device.identified = true;
 
 				if (match = /Maple([0-9]*)/.exec(ua)) {
@@ -3896,7 +3368,7 @@ var UserAgents = (function(){
 				this.os.name = '';
 				this.device.manufacturer = 'Sony';
 				this.device.model = 'Internet TV';
-				this.device.type = 'television';
+				this.device.type = TYPE_TELEVISION;
 				this.device.identified = true;
 			}
 
@@ -3914,7 +3386,7 @@ var UserAgents = (function(){
 				this.os.name = '';
 				this.device.manufacturer = 'Philips';
 				this.device.model = 'Net TV';
-				this.device.type = 'television';
+				this.device.type = TYPE_TELEVISION;
 				this.device.identified = true;
 			}
 			
@@ -3933,7 +3405,7 @@ var UserAgents = (function(){
 				this.os.name = '';
 				this.device.manufacturer = STRINGS_LG;
 				this.device.model = 'NetCast TV ' + match[1];
-				this.device.type = 'television';
+				this.device.type = TYPE_TELEVISION;
 				this.device.identified = true;
 			}
 
@@ -3941,7 +3413,7 @@ var UserAgents = (function(){
 				this.os.name = '';
 				this.device.manufacturer = STRINGS_LG;
 				this.device.model = 'Smart TV';
-				this.device.type = 'television';
+				this.device.type = TYPE_TELEVISION;
 				this.device.identified = true;
 			}
 			
@@ -3957,7 +3429,7 @@ var UserAgents = (function(){
 				this.os.name = '';
 				this.device.manufacturer = 'Toshiba';
 				this.device.model = 'Smart TV';
-				this.device.type = 'television';
+				this.device.type = TYPE_TELEVISION;
 				this.device.identified = true;
 			}
 			
@@ -3971,7 +3443,7 @@ var UserAgents = (function(){
 				this.browser.name = '';
 				this.browser.version = null;
 				this.device.model = 'NetRange MMH';
-				this.device.type = 'television';
+				this.device.type = TYPE_TELEVISION;
 				this.device.identified = true;
 			}
 
@@ -3983,13 +3455,13 @@ var UserAgents = (function(){
 				this.os.name = '';
 				this.browser.name = 'MachBlue XT'
 				this.browser.version = new Version({ value: match[1], details: 2 });
-				this.device.type = 'television';
+				this.device.type = TYPE_TELEVISION;
 			}
 
 			if (ua == 'MachBlue') {
 				this.os.name = '';
 				this.browser.name = 'MachBlue XT'
-				this.device.type = 'television';
+				this.device.type = TYPE_TELEVISION;
 			}
 
 			/****************************************************
@@ -4000,7 +3472,7 @@ var UserAgents = (function(){
 				this.os.name = '';
 				this.device.manufacturer = 'ADB';
 				this.device.model = (match[1] != 'Unknown' ? match[1].replace('ADB','') + ' ' : '') + 'IPTV receiver';
-				this.device.type = 'television';
+				this.device.type = TYPE_TELEVISION;
 				this.device.identified = true;
 			}
 
@@ -4012,7 +3484,7 @@ var UserAgents = (function(){
 				this.os.name = '';
 				this.device.manufacturer = 'MStar';
 				this.device.model = 'PVR';
-				this.device.type = 'television';
+				this.device.type = TYPE_TELEVISION;
 				this.device.identified = true;
 				
 				this.browser.name = 'Origyn Web Browser';
@@ -4026,7 +3498,7 @@ var UserAgents = (function(){
 				this.os.name = '';
 				this.device.manufacturer = 'TechniSat';
 				this.device.model = match[1];
-				this.device.type = 'television';
+				this.device.type = TYPE_TELEVISION;
 				this.device.identified = true;
 			}
 			
@@ -4038,7 +3510,7 @@ var UserAgents = (function(){
 				this.os.name = '';
 				this.device.manufacturer = 'Technicolor';
 				this.device.model = match[1];
-				this.device.type = 'television';
+				this.device.type = TYPE_TELEVISION;
 				this.device.identified = true;
 			}
 			
@@ -4050,7 +3522,7 @@ var UserAgents = (function(){
 				this.os.name = '';
 				this.device.manufacturer = 'Winbox';
 				this.device.model = 'Evo2';
-				this.device.type = 'television';
+				this.device.type = TYPE_TELEVISION;
 				this.device.identified = true;
 			}
 			
@@ -4060,7 +3532,7 @@ var UserAgents = (function(){
 
 			if (match = /^Roku\/DVP-([0-9]+)/.exec(ua)) {
 				this.device.manufacturer = 'Roku';
-				this.device.type = 'television';
+				this.device.type = TYPE_TELEVISION;
 				
 				switch (match[1]) {
 					case '2000':	this.device.model = 'HD'; break;
@@ -4107,7 +3579,7 @@ var UserAgents = (function(){
 					}
 				}
 
-				this.device.type = 'television';
+				this.device.type = TYPE_TELEVISION;
 			}
 			
 			/****************************************************
@@ -4115,11 +3587,11 @@ var UserAgents = (function(){
 			 */
 
 			if (ua.match('InettvBrowser')) {
-				this.device.type = 'television';
+				this.device.type = TYPE_TELEVISION;
 			}
 
 			if (ua.match('MIDP')) {
-				this.device.type = 'mobile';
+				this.device.type = TYPE_MOBILE;
 			}
 			
 			/****************************************************
@@ -4170,35 +3642,29 @@ var UserAgents = (function(){
 				}
 
 				for (var i = 0; i < candidates.length; i++) {
-				
 					if (!this.device.model && !this.device.manufacturer) {
-						var model = cleanupModel(candidates[i]);
 						var result = false;
 						
 						if (this.os.name == 'Android') {
-							if (typeof ANDROID_MODELS[model] != 'undefined') {
-								this.device.manufacturer = ANDROID_MODELS[model][0];
-								this.device.model = ANDROID_MODELS[model][1];
-								if (typeof ANDROID_MODELS[model][2] != 'undefined') this.device.type = ANDROID_MODELS[model][2];
-								this.device.identified = true;
-								
+							var device = DeviceModels.identify('android', candidates[i]);
+							if (device.identified) {
 								result = true;
+
+								this.device = device;
 							}
 						}
 	
 						if (!this.os.name || this.os.name == 'Windows' || this.os.name == 'Windows Mobile' || this.os.name == 'Windows CE') {
-							if (typeof WINDOWS_MOBILE_MODELS[model] != 'undefined') {
-								this.device.manufacturer = WINDOWS_MOBILE_MODELS[model][0];
-								this.device.model = WINDOWS_MOBILE_MODELS[model][1];
-								this.device.type = 'mobile';
-								this.device.identified = true;
-								
+							var device = DeviceModels.identify('wm', candidates[i]);
+							if (device.identified) {
+								result = true;
+
+								this.device = device;
+
 								if (this.os.name != 'Windows Mobile') {
 									this.os.name = 'Windows Mobile';
 									this.os.version = null;
 								}
-	
-								result = true;
 							}
 						}
 					}
@@ -4206,50 +3672,50 @@ var UserAgents = (function(){
 					if (!result) {
 						if (match = /^GIONEE-([^\s]+)/.exec(candidates[i])) {
 							this.device.manufacturer = 'Gionee';
-							this.device.model = cleanupModel(match[1]);
-							this.device.type = 'mobile';
+							this.device.model = DeviceModels.cleanup(match[1]);
+							this.device.type = TYPE_MOBILE;
 							this.device.identified = true;
 						}
 						
 						if (match = /^HTC_?([^\/_]+)(?:\/|_|$)/.exec(candidates[i])) {
 							this.device.manufacturer = STRINGS_HTC;
-							this.device.model = cleanupModel(match[1]);
-							this.device.type = 'mobile';
+							this.device.model = DeviceModels.cleanup(match[1]);
+							this.device.type = TYPE_MOBILE;
 							this.device.identified = true;
 						}
 						
 						if (match = /^HUAWEI-([^\/]*)/.exec(candidates[i])) {
 							this.device.manufacturer = STRINGS_HUAWEI;
-							this.device.model = cleanupModel(match[1]);
-							this.device.type = 'mobile';
+							this.device.model = DeviceModels.cleanup(match[1]);
+							this.device.type = TYPE_MOBILE;
 							this.device.identified = true;
 						}
 		
 						if (match = /(?:^|\()LGE?(?:\/|-|_|\s)([^\s]*)/.exec(candidates[i])) {
 							this.device.manufacturer = STRINGS_LG;
-							this.device.model = cleanupModel(match[1]);
-							this.device.type = 'mobile';
+							this.device.model = DeviceModels.cleanup(match[1]);
+							this.device.type = TYPE_MOBILE;
 							this.device.identified = true;
 						}
 		
 						if (match = /^MOT-([^\/_]+)(?:\/|_|$)/.exec(candidates[i])) {
 							this.device.manufacturer = STRINGS_MOTOROLA;
-							this.device.model = cleanupModel(match[1]);
-							this.device.type = 'mobile';
+							this.device.model = DeviceModels.cleanup(match[1]);
+							this.device.type = TYPE_MOBILE;
 							this.device.identified = true;
 						}
 		
 						if (match = /^Motorola_([^\/_]+)(?:\/|_|$)/.exec(candidates[i])) {
 							this.device.manufacturer = STRINGS_MOTOROLA;
-							this.device.model = cleanupModel(match[1]);
-							this.device.type = 'mobile';
+							this.device.model = DeviceModels.cleanup(match[1]);
+							this.device.type = TYPE_MOBILE;
 							this.device.identified = true;
 						}
 		
 						if (match = /^Nokia([^\/]+)(?:\/|$)/.exec(candidates[i])) {
 							this.device.manufacturer = 'Nokia';
-							this.device.model = cleanupModel(match[1]);
-							this.device.type = 'mobile';
+							this.device.model = DeviceModels.cleanup(match[1]);
+							this.device.type = TYPE_MOBILE;
 							this.device.identified = true;
 							
 							if (!this.os.name) {
@@ -4259,58 +3725,33 @@ var UserAgents = (function(){
 		
 						if (match = /^SonyEricsson([^\/_]+)(?:\/|_|$)/.exec(candidates[i])) {
 							this.device.manufacturer = STRINGS_SONY_ERICSSON;
-							this.device.model = cleanupModel(match[1]);
-							this.device.type = 'mobile';
+							this.device.model = DeviceModels.cleanup(match[1]);
+							this.device.type = TYPE_MOBILE;
 							this.device.identified = true;
 						}
 		
 						if (match = /^SAMSUNG-([^\/_]+)(?:\/|_|$)/.exec(candidates[i])) {
 							this.device.manufacturer = STRINGS_SAMSUNG;
-							this.device.model = cleanupModel(match[1]);
-							this.device.type = 'mobile';
+							this.device.model = match[1];
+							this.device.type = TYPE_MOBILE;
 							
 							if (this.os.name == 'Bada') {
-								var manufacturer = 'SAMSUNG';
-								var model = cleanupModel(this.device.model);
-								
-								if (typeof BADA_MODELS[manufacturer] != 'undefined' && 
-									typeof BADA_MODELS[manufacturer][model] != 'undefined') 
-								{
-									this.device.manufacturer = BADA_MODELS[manufacturer][model][0];
-									this.device.model = BADA_MODELS[manufacturer][model][1];
-									this.device.identified = true;
-								}
+								this.device = DeviceModels.identify('bada', this.device.model);
 							}
 							
 							else if (match = /Jasmine\/([0-9.]*)/.exec(ua)) {
 								var version = match[1];
-								var manufacturer = 'SAMSUNG';
-								var model = cleanupModel(this.device.model);
 								
-								if (typeof TOUCHWIZ_MODELS[manufacturer] != 'undefined' && 
-									typeof TOUCHWIZ_MODELS[manufacturer][model] != 'undefined') 
-								{
-									this.device.manufacturer = TOUCHWIZ_MODELS[manufacturer][model][0];
-									this.device.model = TOUCHWIZ_MODELS[manufacturer][model][1];
-									this.device.identified = true;
-									
+								this.device = DeviceModels.identify('touchwiz', this.device.model);
+								if (this.device.identified) {
 									this.os.name = 'Touchwiz';
 									this.os.version = new Version({ value: '2.0' });
 								}
 							}
 				
 							else if (match = /Dolfin\/([0-9.]*)/.exec(ua)) {
-								var version = match[1];
-								var manufacturer = 'SAMSUNG';
-								var model = cleanupModel(this.device.model);
-								
-								if (typeof BADA_MODELS[manufacturer] != 'undefined' && 
-									typeof BADA_MODELS[manufacturer][model] != 'undefined') 
-								{
-									this.device.manufacturer = BADA_MODELS[manufacturer][model][0];
-									this.device.model = BADA_MODELS[manufacturer][model][1];
-									this.device.identified = true;
-									
+								this.device = DeviceModels.identify('bada', this.device.model);
+								if (this.device.identified) {
 									this.os.name = 'Bada';
 									
 									switch(version) {
@@ -4319,14 +3760,9 @@ var UserAgents = (function(){
 										case '3.0':		this.os.version = new Version({ value: '2.0' }); break;					
 									}	
 								}
-		
-								if (typeof TOUCHWIZ_MODELS[manufacturer] != 'undefined' && 
-									typeof TOUCHWIZ_MODELS[manufacturer][model] != 'undefined') 
-								{
-									this.device.manufacturer = TOUCHWIZ_MODELS[manufacturer][model][0];
-									this.device.model = TOUCHWIZ_MODELS[manufacturer][model][1];
-									this.device.identified = true;
-									
+								
+								this.device = DeviceModels.identify('touchwiz', this.device.model);
+								if (this.device.identified) {
 									this.os.name = 'Touchwiz';
 		
 									switch(version) {
@@ -4336,6 +3772,10 @@ var UserAgents = (function(){
 									}	
 								}
 							}
+							
+							if (!this.device.identified) {
+								this.device.model = DeviceModels.cleanup(this.device.model);
+							}
 						}
 					}
 				}
@@ -4345,14 +3785,14 @@ var UserAgents = (function(){
 			if (match = /\((?:LG[-|\/])(.*) (?:Browser\/)?AppleWebkit/.exec(ua)) {
 				this.device.manufacturer = STRINGS_LG;
 				this.device.model = match[1];
-				this.device.type = 'mobile';
+				this.device.type = TYPE_MOBILE;
 				this.device.identified = true;
 			}
 
 			if (match = /^Mozilla\/5.0 \((?:Nokia|NOKIA)(?:\s?)([^\)]+)\)UC AppleWebkit\(like Gecko\) Safari\/530$/.exec(ua)) {
 				this.device.manufacturer = 'Nokia';
 				this.device.model = match[1];
-				this.device.type = 'mobile';
+				this.device.type = TYPE_MOBILE;
 				this.device.identified = true;
 				
 				this.os.name = 'Series60';
@@ -4396,7 +3836,7 @@ var UserAgents = (function(){
 			if (ua.match('MSIE')) {
 				this.browser.name = 'Internet Explorer';
 				
-				if (ua.match('IEMobile') || ua.match('Windows CE') || ua.match('Windows Phone') || ua.match('WP7')) {
+				if (ua.match('IEMobile') || ua.match('Windows CE') || ua.match('Windows Phone') || ua.match('WP7') || ua.match('WPDesktop')) {
 					this.browser.name = 'Mobile Internet Explorer';
 				}
 
@@ -4426,40 +3866,38 @@ var UserAgents = (function(){
 				}
 				
 				if (this.browser.version && ua.match('Edition Labs')) {
-					this.browser.version.type = 'alpha';
 					this.browser.channel = 'Labs';
 				}
 				
 				if (this.browser.version && ua.match('Edition Next')) {
-					this.browser.version.type = 'alpha';
 					this.browser.channel = 'Next';
 				}
 				
 				if (ua.match('Opera Tablet')) {
 					this.browser.name = 'Opera Mobile';
-					this.device.type = 'tablet';
+					this.device.type = TYPE_TABLET;
 				}
 				
 				if (ua.match('Opera Mobi')) {
 					this.browser.name = 'Opera Mobile';
-					this.device.type = 'mobile';
+					this.device.type = TYPE_MOBILE;
 				}
 
 				if (match = /Opera Mini;/.exec(ua)) {
 					this.browser.name = 'Opera Mini';
 					this.browser.version = null;
 					this.browser.mode = 'proxy';
-					this.device.type = 'mobile';
+					this.device.type = TYPE_MOBILE;
 				}
 				
 				if (match = /Opera Mini\/(?:att\/)?([0-9.]*)/.exec(ua)) {
 					this.browser.name = 'Opera Mini';
 					this.browser.version = new Version({ value: match[1], details: -1 });
 					this.browser.mode = 'proxy';
-					this.device.type = 'mobile';
+					this.device.type = TYPE_MOBILE;
 				}
 				
-				if (this.browser.name == 'Opera' && this.device.type == 'mobile') {
+				if (this.browser.name == 'Opera' && this.device.type == TYPE_MOBILE) {
 					this.browser.name = 'Opera Mobile';
 					
 					if (ua.match(/BER/)) {
@@ -4469,19 +3907,19 @@ var UserAgents = (function(){
 				}
 
 				if (ua.match('InettvBrowser')) {
-					this.device.type = 'television';
+					this.device.type = TYPE_TELEVISION;
 				}
 
 				if (ua.match('Opera TV') || ua.match('Opera-TV')) {
 					this.browser.name = 'Opera';
-					this.device.type = 'television';
+					this.device.type = TYPE_TELEVISION;
 				}
 				
 				if (ua.match('Linux zbov')) {
 					this.browser.name = 'Opera Mobile';
 					this.browser.mode = 'desktop';
 				
-					this.device.type = 'mobile';
+					this.device.type = TYPE_MOBILE;
 
 					this.os.name = null;
 					this.os.version = null;
@@ -4492,7 +3930,7 @@ var UserAgents = (function(){
 					this.browser.version = null;
 					this.browser.mode = 'desktop';
 
-					this.device.type = 'mobile';
+					this.device.type = TYPE_MOBILE;
 				
 					this.os.name = null;
 					this.os.version = null;
@@ -4520,18 +3958,18 @@ var UserAgents = (function(){
 				}
 				
 				if (ua.match('Fennec')) {
-					this.device.type = 'mobile';
+					this.device.type = TYPE_MOBILE;
 				}
 				
 				if (ua.match('Mobile; rv')) {
-					this.device.type = 'mobile';
+					this.device.type = TYPE_MOBILE;
 				}
 
 				if (ua.match('Tablet; rv')) {
-					this.device.type = 'tablet';
+					this.device.type = TYPE_TABLET;
 				}
 				
-				if (this.device.type == 'mobile' || this.device.type == 'tablet') {
+				if (this.device.type == TYPE_MOBILE || this.device.type == TYPE_TABLET) {
 					this.browser.name = 'Firefox Mobile';
 				}
 			}
@@ -4746,7 +4184,7 @@ var UserAgents = (function(){
 				}
 
 				this.os.name = 'Windows Phone';
-				this.device.type = 'mobile';
+				this.device.type = TYPE_MOBILE;
 			}
 			
 			
@@ -4769,14 +4207,14 @@ var UserAgents = (function(){
 		
 			if (ua.match('Net[fF]ront')) {
 				this.browser.name = 'NetFront';
-				this.device.type = 'mobile';
+				this.device.type = TYPE_MOBILE;
 
 				if (match = /NetFront\/([0-9.]*)/.exec(ua)) {
 					this.browser.version = new Version({ value: match[1] });
 				}
 
 				if (ua.match('InettvBrowser')) {
-					this.device.type = 'television';
+					this.device.type = TYPE_TELEVISION;
 				}
 			}
 			
@@ -4794,7 +4232,7 @@ var UserAgents = (function(){
 					
 					this.device.manufacturer = 'Amazon';
 					this.device.model = 'Kindle Fire';
-					this.device.type = 'tablet';
+					this.device.type = TYPE_TABLET;
 					this.device.identified = true;
 					
 					if (this.os.name != 'Android') {
@@ -4824,7 +4262,7 @@ var UserAgents = (function(){
 			if (ua.match('Iris')) {
 				this.browser.name = 'Iris';
 
-				this.device.type = 'mobile';
+				this.device.type = TYPE_MOBILE;
 				this.device.model = null;
 				this.device.manufacturer = null;
 
@@ -4860,7 +4298,7 @@ var UserAgents = (function(){
 		
 			if (ua.match('Boxee')) {
 				this.browser.name = 'Boxee';
-				this.device.type = 'television';
+				this.device.type = TYPE_TELEVISION;
 
 				if (match = /Boxee\/([0-9.]*)/.exec(ua)) {
 					this.browser.version = new Version({ value: match[1] });
@@ -4873,7 +4311,7 @@ var UserAgents = (function(){
 			if (match = /LG Browser\/([0-9.]*)/.exec(ua)) {
 				this.browser.name = 'LG Browser';
 				this.browser.version = new Version({ value: match[1], details: 2 });
-				this.device.type = 'television';
+				this.device.type = TYPE_TELEVISION;
 			}
 			
 			/****************************************************
@@ -4886,8 +4324,8 @@ var UserAgents = (function(){
 				this.os.name = '';
 				this.os.version = null;
 
-				if (this.device.type != 'television') {
-					this.device.type = 'television';
+				if (this.device.type != TYPE_TELEVISION) {
+					this.device.type = TYPE_TELEVISION;
 					this.device.model = null;
 					this.device.manufacturer = null;
 				}
@@ -4903,7 +4341,7 @@ var UserAgents = (function(){
 			if (match = /ANTGalio\/([0-9.]*)/.exec(ua)) {
 				this.browser.name = 'ANT Galio';
 				this.browser.version = new Version({ value: match[1], details: 3 });
-				this.device.type = 'television';
+				this.device.type = TYPE_TELEVISION;
 			}
 			
 			/****************************************************
@@ -4913,9 +4351,9 @@ var UserAgents = (function(){
 				this.browser.name = 'NetFront NX';
 				this.browser.version = new Version({ value: match[1], details: 2 });
 				if (match = /DTV/i.exec(ua)) {
-					this.device.type = 'television';
+					this.device.type = TYPE_TELEVISION;
 				} else if (match = /mobile/i.exec(ua)) {
-					this.device.type = 'mobile';
+					this.device.type = TYPE_MOBILE;
 				} else {
 					this.device.type = 'desktop';
 				} 
@@ -4962,7 +4400,7 @@ var UserAgents = (function(){
 					this.os.name = '';
 				}
 				
-				this.device.type = 'mobile';
+				this.device.type = TYPE_MOBILE;
 
 				if (match = /^IUC \(U;\s?iOS ([0-9\.]+);/.exec(ua)) {
 					this.os.name = 'iOS';
@@ -4970,17 +4408,10 @@ var UserAgents = (function(){
 				}
 				
 				if (match = /^JUC \(Linux; U; ([0-9\.]+)[^;]*; [^;]+; ([^;]*[^\s])\s*; [0-9]+\*[0-9]+\)/.exec(ua)) {
-					var model = cleanupModel(match[2]);
-	
 					this.os.name = 'Android';
 					this.os.version = new Version({ value: match[1] });
 
-					if (typeof ANDROID_MODELS[model] != 'undefined') {
-						this.device.manufacturer = ANDROID_MODELS[model][0];
-						this.device.model = ANDROID_MODELS[model][1];
-						if (typeof ANDROID_MODELS[model][2] != 'undefined') this.device.type = ANDROID_MODELS[model][2];
-						this.device.identified = true;
-					}					
+					this.device = DeviceModels.identify('android', match[2]);
 				}
 			}
 
@@ -5020,7 +4451,7 @@ var UserAgents = (function(){
 				this.browser.name = 'Skyfire';
 				this.browser.version = new Version({ value: match[1] });
 
-				this.device.type = 'mobile';
+				this.device.type = TYPE_MOBILE;
 
 				this.os.name = 'Android';
 				this.os.version = null;
@@ -5034,7 +4465,7 @@ var UserAgents = (function(){
 				this.browser.name = 'Dolphin';
 				this.browser.version = new Version({ value: match[1] });
 
-				this.device.type = 'mobile';
+				this.device.type = TYPE_MOBILE;
 
 				if (this.os.name != 'Android') {
 					this.os.name = 'Android';
@@ -5044,7 +4475,7 @@ var UserAgents = (function(){
 
 			if (match = /Dolphin\/(?:INT|CN)/.exec(ua)) {
 				this.browser.name = 'Dolphin';
-				this.device.type = 'mobile';
+				this.device.type = TYPE_MOBILE;
 			}	
 
 			/****************************************************
@@ -5087,7 +4518,7 @@ var UserAgents = (function(){
 				this.browser.name = 'Puffin';
 				this.browser.version = new Version({ value: match[1], details: 2 });
 
-				this.device.type = 'mobile';
+				this.device.type = TYPE_MOBILE;
 
 				if (this.os.name == 'Linux') {
 					this.os.name = null;
@@ -5095,16 +4526,6 @@ var UserAgents = (function(){
 				}
 			}	
 
-			/****************************************************
-			 *		360 Extreme Explorer
-			 */
-		
-			if (ua.match('360EE')) {
-				this.browser.stock = false;
-				this.browser.name = '360 Extreme Explorer';
-				this.browser.version = null;
-			}
-			
 			/****************************************************
 			 *		Midori
 			 */
@@ -5161,11 +4582,16 @@ var UserAgents = (function(){
 				{ name: 'Songbird', 			regexp: /Songbird\/([0-9.]*)/ },
 				{ name: 'Thunderbird', 			regexp: /Thunderbird\/([0-9.]*)/ },
 
+				{ name: '360 Extreme Explorer', regexp: /360EE/ },
+				{ name: '360 Phone Browser', 	regexp: /360 Android Phone Browser \(V([0-9.]*)\)/ },
+				{ name: 'ABrowse', 				regexp: /Abrowse ([0-9.]*)/ },
 				{ name: 'Abrowser', 			regexp: /Abrowser\/([0-9.]*)/ },
 				{ name: 'arora', 				regexp: /[Aa]rora\/([0-9.]*)/ },
+				{ name: 'Avant Browser',		regexp: /Avant TriCore/ },
 				{ name: 'Baidu Browser', 		regexp: /M?BaiduBrowser\/([0-9.]*)/i },
 				{ name: 'Baidu Browser', 		regexp: /BdMobile\/([0-9.]*)/i },
 				{ name: 'Baidu Browser', 		regexp: /FlyFlow\/([0-9.]*)/, details: 2 },
+				{ name: 'Baidu Browser', 		regexp: /BIDUBrowser[ \/]([0-9.]*)/ },
 				{ name: 'Camino', 				regexp: /Camino\/([0-9.]*)/ },
 				{ name: 'Canure',				regexp: /Canure\/([0-9.]*)/, details: 3 },
 				{ name: 'CometBird', 			regexp: /CometBird\/([0-9.]*)/ },
@@ -5178,7 +4604,7 @@ var UserAgents = (function(){
 				{ name: 'Dooble', 				regexp: /Dooble(?:\/([0-9.]*))?/ },
 				{ name: 'Dorothy', 				regexp: /Dorothy$/ },
 				{ name: 'DWB', 					regexp: /dwb(?:-hg)?(?:\/([0-9.]*))?/ },
-				{ name: 'Epiphany', 			regexp: /Epiphany\/([0-9.]*)/ },
+				{ name: 'GNOME Web', 			regexp: /Epiphany\/([0-9.]*)/ },
 				{ name: 'FireWeb', 				regexp: /FireWeb\/([0-9.]*)/ },
 				{ name: 'Flock', 				regexp: /Flock\/([0-9.]*)/, details: 3 },
 				{ name:	'Galeon',				regexp: /Galeon\/([0-9.]*)/, details: 3 },
@@ -5201,6 +4627,7 @@ var UserAgents = (function(){
 				{ name: 'Intermec Browser', 	regexp: /Intermec\/([0-9.]*)/, details: 2 },
 				{ name: 'MaCross Mobile',		regexp: /MaCross\/([0-9.]*)/ },
 				{ name: 'Maxthon', 				regexp: /Maxthon[\/ ]([0-9.]*)/, details: 3 },
+				{ name: 'Mercury Browser',		regexp: /Mercury\/([0-9.]*)/ },
 				{ name: 'MiniBrowser',			regexp: /MiniBr?owserM\/([0-9.]*)/ },
 				{ name: 'MiniBrowser',			regexp: /MiniBrowserMobile\/([0-9.]*)/ },
 				{ name: 'MixShark', 			regexp: /MixShark\/([0-9.]*)/ },
@@ -5210,10 +4637,12 @@ var UserAgents = (function(){
 				{ name:	'Odyssey',				regexp: /OWB\/([0-9.]*)/ },
 				{ name: 'OmniWeb', 				regexp: /OmniWeb/ },
 				{ name:	'Orca',					regexp: /Orca\/([0-9.]*)/ },
+				{ name:	'Open Sankoré',			regexp: /Open-Sankore\/([0-9.]*)/ },
 				{ name: 'Origyn',				regexp: /Origyn Web Browser/ },
 				{ name: 'Palemoon', 			regexp: /Pale[mM]oon\/([0-9.]*)/ },
 				{ name: 'Phantom', 				regexp: /Phantom\/V([0-9.]*)/ },
 				{ name: 'Polaris',	 			regexp: /Polaris\/v?([0-9.]*)/i, details: 2 },
+				{ name: 'Qihoo 360',			regexp: /QIHU THEWORLD/ },
 				{ name: 'QtCreator',			regexp: /QtCreator\/([0-9.]*)/ },
 				{ name: 'QtQmlViewer',			regexp: /QtQmlViewer/ },
 				{ name: 'QtTestBrowser',		regexp: /QtTestBrowser\/([0-9.]*)/ },
@@ -5241,6 +4670,7 @@ var UserAgents = (function(){
 				{ name: 'WebPositive', 			regexp: /WebPositive/ },
 				{ name: 'WebRender', 			regexp: /WebRender/ },
 				{ name: 'Wyzo', 				regexp: /Wyzo\/([0-9.]*)/, details: 3 },
+				{ name: 'Yandex Browser',		regexp: /YaBrowser\/([0-9.]*)/, details: 2 },
 				{ name: 'Zetakey',				regexp: /Zetakey Webkit\/([0-9.]*)/ },
 				{ name: 'Zetakey',				regexp: /Zetakey\/([0-9.]*)/ }
 			]
@@ -5332,6 +4762,10 @@ var UserAgents = (function(){
 				}
 
 				if (this.os.name == 'Windows Phone') {
+					if (parseVersion(this.engine.version) == 6 && parseFloat(this.os.version) < 8) {
+						this.os.version = new Version({ value: '8.0' });
+					}
+
 					if (parseVersion(this.engine.version) == 5 && parseFloat(this.os.version) < 7.5) {
 						this.os.version = new Version({ value: '7.5' });
 					}
@@ -5360,7 +4794,7 @@ var UserAgents = (function(){
 				this.engine.version = null;
 			}
 			
-			if (this.device.type == 'television' && this.browser.name == 'Opera') {
+			if (this.device.type == TYPE_TELEVISION && this.browser.name == 'Opera') {
 				this.browser.name = 'Opera Devices';
 				switch (true) {
 					case this.engine.version.is('2.12'):	this.browser.version = new Version({ value: 3.4 }); break;
@@ -5399,16 +4833,7 @@ var UserAgents = (function(){
 					this.engine.name = 'Webkit';
 					this.engine.version = null;
 	
-					this.device.model = match[1];
-					this.device.type = 'mobile';
-	
-					var model = cleanupModel(this.device.model);
-					if (typeof ANDROID_MODELS[model] != 'undefined') {
-						this.device.manufacturer = ANDROID_MODELS[model][0];
-						this.device.model = ANDROID_MODELS[model][1];
-						if (typeof ANDROID_MODELS[model][2] != 'undefined') this.device.type = ANDROID_MODELS[model][2];
-						this.device.identified = true;
-					}
+					this.device = DeviceModels.identify('android', match[1]);
 
 					this.features.push('foundDevice');
 				}
@@ -5424,16 +4849,7 @@ var UserAgents = (function(){
 					this.engine.name = 'Webkit';
 					this.engine.version = null;
 	
-					this.device.model = match[1];
-					this.device.type = 'mobile';
-	
-					var model = cleanupModel(this.device.model);
-					if (typeof ANDROID_MODELS[model] != 'undefined') {
-						this.device.manufacturer = ANDROID_MODELS[model][0];
-						this.device.model = ANDROID_MODELS[model][1];
-						if (typeof ANDROID_MODELS[model][2] != 'undefined') this.device.type = ANDROID_MODELS[model][2];
-						this.device.identified = true;
-					}
+					this.device = DeviceModels.identify('android', match[1]);
 
 					this.features.push('foundDevice');
 				}
@@ -5604,8 +5020,8 @@ var UserAgents = (function(){
 			else
 				device += (typeof this.device.model != 'undefined' && this.device.model ? 'unrecognized device (' + this.device.model + ')' : '');
 			
-			if (!device && !os && this.device.type == 'television') {
-				device = 'television';
+			if (!device && !os && this.device.type == TYPE_TELEVISION) {
+				device = TYPE_TELEVISION;
 			}
 		
 			if (!device && this.device.type == 'emulator') {
@@ -5654,59 +5070,6 @@ var UserAgents = (function(){
 		}
 	};
 
-	function cleanupModel(s) {
-		s = typeof s == 'undefined' ? '' : s;
-	
-		s = s.replace(/_TD$/, '');
-		s = s.replace(/_CMCC$/, '');
-
-		s = s.replace(/_/g, " ");
-		s = s.replace(/^\s+|\s+$/g, "");
-		s = s.replace(/\/[^/]+$/, "");
-		s = s.replace(/\/[^/]+ Android\/.*/, "");
-
-		s = s.replace(/^tita on /, '');
-		s = s.replace(/^Android on /, '');
-		s = s.replace(/^Android for /, '');
-		s = s.replace(/^ICS AOSP on /, '');
-		s = s.replace(/^Full AOSP on /, '');
-		s = s.replace(/^Full Android on /, '');
-		s = s.replace(/^Full Cappuccino on /, '');
-		s = s.replace(/^Full MIPS Android on /, '');
-		s = s.replace(/^Full Android/, '');
-
-		s = s.replace(/^Acer ?/i, '');
-		s = s.replace(/^Iconia Tab /, '');
-		s = s.replace(/^Iconia /, '');
-		s = s.replace(/^Ainol /, '');
-		s = s.replace(/^Coolpad ?/i, 'Coolpad ');
-		s = s.replace(/^ALCATEL /, '');
-		s = s.replace(/^Alcatel OT-(.*)/, 'one touch $1');
-		s = s.replace(/^YL-/, '');
-		s = s.replace(/^Novo7 ?/i, 'Novo7 ');
-		s = s.replace(/^GIONEE /, '');
-		s = s.replace(/^HW-/, '');
-		s = s.replace(/^Huawei[ -]/i, 'Huawei ');
-		s = s.replace(/^SAMSUNG[ -]/i, '');
-		s = s.replace(/^SonyEricsson/, '');
-		s = s.replace(/^Lenovo Lenovo/, 'Lenovo');
-		s = s.replace(/^LNV-Lenovo/, 'Lenovo');
-		s = s.replace(/^Lenovo-/, 'Lenovo ');
-		s = s.replace(/^(LG)[ _\/]/, '$1-');
-		s = s.replace(/^(HTC.*)\s(?:v|V)?[0-9.]+$/, '$1');
-		s = s.replace(/^(HTC)[-\/]/, '$1 ');
-		s = s.replace(/^(HTC)([A-Z][0-9][0-9][0-9])/, '$1 $2');
-		s = s.replace(/^(Motorola[\s|-])/, '')
-		s = s.replace(/^(Moto|MOT-)/, '')
-		
-		s = s.replace(/-?(orange(-ls)?|vodafone|bouygues)$/i, '');
-		s = s.replace(/http:\/\/.+$/i, '');
-
-		s = s.replace(/^\s+|\s+$/g, "");
-
-		return s;
-	}
-	
 	function parseVersion(version) {
 		version = version.toString();
 		var components = version.split('.');

From 44ca63969f342f5294133f76c1b9745a6959469e Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 21 Oct 2012 19:10:15 +0200
Subject: [PATCH 071/174] Add new tab for the tumblr blog

---
 about.html                     | 1 +
 backend/templates/browser.html | 1 +
 backend/templates/feature.html | 1 +
 backend/templates/results.html | 1 +
 donate.html                    | 1 +
 index.html                     | 1 +
 6 files changed, 6 insertions(+)

diff --git a/about.html b/about.html
index 736fb962..602067a6 100644
--- a/about.html
+++ b/about.html
@@ -54,6 +54,7 @@ <h1 data-i18n>The HTML5 test <em>&ndash; how well does your browser support HTML
 				<li><a href='/compare/browser/index.html' data-i18n>Compare</a></li>
 
 				<li class='right selected'><a href='/about.html' data-i18n>About<span> the test</span></a></li>
+				<li class='right'><a href='http://blog.html5test.com/' data-i18n>News</a></li>
 			</ul>
 		</div>
 		
diff --git a/backend/templates/browser.html b/backend/templates/browser.html
index 08dd2b4a..e1edde55 100644
--- a/backend/templates/browser.html
+++ b/backend/templates/browser.html
@@ -34,6 +34,7 @@ <h1 data-i18n>The HTML5 test <em>&ndash; how well does your browser support HTML
 				<li class='selected'><a href='/compare/browser/index.html' data-i18n>Compare</a></li>
 
 				<li class='right'><a href='/about.html' data-i18n>About<span> the test</span></a></li>
+				<li class='right'><a href='http://blog.html5test.com/' data-i18n>News</a></li>
 			</ul>
 		</div>
 		
diff --git a/backend/templates/feature.html b/backend/templates/feature.html
index 61c33f6e..00ccf67f 100644
--- a/backend/templates/feature.html
+++ b/backend/templates/feature.html
@@ -32,6 +32,7 @@ <h1 data-i18n>The HTML5 test <em>&ndash; how well does your browser support HTML
 				<li class='selected'><a href='/compare/browser/index.html' data-i18n>Compare</a></li>
 
 				<li class='right'><a href='/about.html' data-i18n>About<span> the test</span></a></li>
+				<li class='right'><a href='http://blog.html5test.com/' data-i18n>News</a></li>
 			</ul>
 		</div>
 		
diff --git a/backend/templates/results.html b/backend/templates/results.html
index 3ce7de29..cb360937 100644
--- a/backend/templates/results.html
+++ b/backend/templates/results.html
@@ -34,6 +34,7 @@ <h1 data-i18n>The HTML5 test <em>&ndash; how well does your browser support HTML
 				<li><a href='/compare/browser/index.html' data-i18n>Compare</a></li>
 
 				<li class='right'><a href='/about.html' data-i18n>About<span> the test</span></a></li>
+				<li class='right'><a href='http://blog.html5test.com/' data-i18n>News</a></li>
 			</ul>
 		</div>
 		
diff --git a/donate.html b/donate.html
index fab54cfb..09cdabe7 100644
--- a/donate.html
+++ b/donate.html
@@ -66,6 +66,7 @@ <h1 data-i18n>The HTML5 test <em>&ndash; how well does your browser support HTML
 				<li><a href='/compare/browser/index.html' data-i18n>Compare</a></li>
 
 				<li class='right selected'><a href='/about.html' data-i18n>About<span> the test</span></a></li>
+				<li class='right'><a href='http://blog.html5test.com/' data-i18n>News</a></li>
 			</ul>
 		</div>
 		
diff --git a/index.html b/index.html
index 8d82f67a..dedf0afb 100644
--- a/index.html
+++ b/index.html
@@ -84,6 +84,7 @@ <h1 data-i18n>The HTML5 test <em>&ndash; how well does your browser support HTML
 				<li><a href='/compare/browser/index.html' data-i18n>Compare</a></li>
 
 				<li class='right'><a href='/about.html' data-i18n>About<span> the test</span></a></li>
+				<li class='right'><a href='http://blog.html5test.com/' data-i18n>News</a></li>
 			</ul>
 		</div>
 		

From fc85c0a4096f85a21014418a532cdf094f6e1421 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 21 Oct 2012 19:10:34 +0200
Subject: [PATCH 072/174] Update date and revision for release of 4.0

---
 index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index dedf0afb..55b9bd2e 100644
--- a/index.html
+++ b/index.html
@@ -93,7 +93,7 @@ <h1 data-i18n>The HTML5 test <em>&ndash; how well does your browser support HTML
 				<!--
 				<div class='updated'>
 					Updated!
-					<span>3 April 2012</span>
+					<span>15 October 2012</span>
 				</div>
 				-->
 				
@@ -389,7 +389,7 @@ <h2>
 				/* Submit results */
 				var payload = '{' +
 							  '"version": "4",' +
-							  '"revision": "0",' +
+							  '"revision": "10",' +
 							  '"uniqueid": "' + r.uniqueid + '",' +
 							  '"score": ' + r.score + ',' +
 							  '"bonus": ' + r.bonus + ',' +

From 044a3906879e312bc41f1113561bf303f6c420ff Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 21 Oct 2012 19:11:57 +0200
Subject: [PATCH 073/174] Update location of 'updated' banner

---
 css/main.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/css/main.css b/css/main.css
index f72f802b..bf92ada6 100644
--- a/css/main.css
+++ b/css/main.css
@@ -166,11 +166,11 @@ body {
 
 .updated {
 	position: absolute;
-	top: -10px;
-	left: 500px;
+	top: -23px;
+	left: -54px;
 	
 	float: left;
-	background-color: #db4d1a;
+	background-color: #dc4f1b;
 	padding: 5px;
 	border-radius: 8px;
 

From 1da96045dc953ad091c7ef5777ded8af83191774 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 21 Oct 2012 19:12:18 +0200
Subject: [PATCH 074/174] New css file that contains all the styles for the
 tumlr blog

---
 css/tumblr.css | 800 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 800 insertions(+)
 create mode 100644 css/tumblr.css

diff --git a/css/tumblr.css b/css/tumblr.css
new file mode 100644
index 00000000..0a32661f
--- /dev/null
+++ b/css/tumblr.css
@@ -0,0 +1,800 @@
+/* http://meyerweb.com/eric/tools/css/reset/ */
+/* v1.0 | 20080212 */
+
+html, body, br, hr, div, span, a, object, 
+iframe, ul, ol, dl, li, dt, dd, h1, h2, h3, 
+h4, h5, h6, blockquote, q, address, small, big, 
+cite, dfn, ins, del, i, em, b, strong, sup, sub, 
+strike, pre, code, samp, kbd, var, tt, form, 
+fieldset, legend, label, input, textarea, 
+option, .nobox {
+	font-size: 100%;
+	margin: 0;
+	outline: 0 none;
+	padding: 0;
+	vertical-align: baseline;
+}
+
+blockquote, q { quotes:none;}
+br { height:0;}
+a img { border:0 none;}
+// img { display:block;}
+img.inline { display:inline;}
+legend { display:none;}
+
+code, samp, kbd, var { font-family:"Courier New","Courier",Monospace;}
+h1, h2, h3, h4, h5, h6, b, strong { font-weight: normal; }
+i, em, cite, dfn, ins { font-style:italic; }
+del, code, samp, kbd, var { font-style:inherit; }
+del { text-decoration:line-through;}
+ins { text-decoration:none; }
+abbr, acronym { 
+	border:0 none;
+	cursor:help;
+	text-decoration:none;
+}
+.bott-patt {
+	background: url("http://static.tumblr.com/xcxngn2/KHpld1vbs/rep-bg-bottom.png") repeat-x bottom left;
+}
+ol, ul {
+	list-style: none;
+	margin: 0;
+}
+ol li,
+ul li {
+	margin: 0;
+}
+
+blockquote, q {
+	quotes: none;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+	content: '';
+	content: none;
+}
+
+/* remember to define focus styles! */
+:focus {
+	outline: 0;
+}
+
+/* remember to highlight inserts somehow! */
+ins {
+	text-decoration: none;
+}
+del {
+	text-decoration: line-through;
+}
+
+/* tables still need 'cellspacing="0"' in the markup */
+table {
+	border-collapse: collapse;
+	border-spacing: 0;
+}
+
+/* - - - RESET STYLES END - - */
+
+
+/* `Clear Floated Elements
+----------------------------------------------------------------------------------------------------*/
+
+/* http://sonspring.com/journal/clearing-floats */
+
+.clear {
+	clear: both;
+	display: block;
+	overflow: hidden;
+	visibility: hidden;
+	width: 0;
+	height: 0;
+}
+
+/* http://perishablepress.com/press/2009/12/06/new-clearfix-hack */
+
+.clearfix:after {
+	clear: both;
+	content: ' ';
+	display: block;
+	font-size: 0;
+	line-height: 0;
+	visibility: hidden;
+	width: 0;
+	height: 0;
+}
+
+/*
+	The following zoom:1 rule is specifically for IE6 + IE7.
+	Move to separate stylesheet if invalid CSS is a problem.
+*/
+* html .clearfix,
+*:first-child+html .clearfix {
+	zoom: 1;
+}
+
+/* - - CLEAR FLOTS END - - */
+html {
+}
+body {
+	background: #fff;
+/*	color: #333333;
+	font: 13px/20px "Helvetica Neue",Helvetica,Arial,sans-serif;
+*/
+	font-family: 'Droid Sans', Arial, Helvetica, sans-serif;
+	text-shadow: 0 1px 0 #fff;
+}
+.noise {
+	background: #EEEEEE url("http://static.tumblr.com/xcxngn2/Iz0ld1v2h/bg.png") repeat;
+}
+a {
+	color: #dc4f1b;
+	}
+a:hover {
+	color: #3B3B3B;
+}
+a:active,a:focus { outline: none; }
+h1, h2, h3, h4 ,h5 {
+	font-weight: bold;
+}
+
+strong, b {
+	font-weight: bold;
+}
+#header p, .post .sidebar p, .description, #footer .footer, #footer .description p {
+	line-height: 1.6363em;
+}
+code, pre {
+	font-size: 13px;
+	padding: 0;
+}
+pre {
+	border: 1px solid #DDDDDD;
+}
+#container {
+	margin: 0 auto;
+	width: 630px;
+	position: relative;
+
+	padding-top: 45px;
+	font-size: 13px;
+	line-height: 20px;
+
+	font-smoothing: antialiased;
+	-moz-font-smoothing: antialiased;
+	-webkit-font-smoothing: antialiased;
+}
+#header { 
+	//padding: 30px 0px;
+	padding: 45px 0 50px; 
+	}
+	#header h1 {
+		font-size: 3em;
+		font-family: 'Alfa Slab One', Arial;
+		font-weight: normal;
+		text-transform: normal;
+		font-size: 40px;
+		}
+		#header h1 a {
+			color: #3b3b3b;
+			text-decoration:none;
+}
+#header p {
+color:#555555;
+padding-right:25em;
+}
+
+
+
+.header {
+	background: #222;
+	background: #222 -webkit-gradient(linear, left 64, left 80, from(#222), to(#111));
+	background: #222 -moz-linear-gradient(top, #111, #222);
+	background: #222 -ms-linear-gradient(top, #111, #222);
+	background: #222 -o-linear-gradient(top, #111, #222);
+	
+	text-shadow: none;
+}
+.header h1 {
+	font-weight: bold;
+	font-size: 0.9em;
+	text-align: left;
+	text-transform: uppercase;
+	letter-spacing: 0.1em;
+	color: #bbb;
+	padding: 8px 0;
+	margin: 0 auto;
+	width: 630px;
+}
+.header h1 em {
+	font-style: normal;
+	color: #666;
+}
+.header ul {
+	margin: 10px auto 0;
+	width: 630px;
+	overflow:hidden;
+
+	list-style-type: none;
+}
+.header ul li {
+	display: block;
+	float: left;
+	margin: 0 3px 0 0;
+	padding: 0 10px;
+	line-height: 32px;
+	color: #fff;
+	font-size: 0.9em;
+	text-transform: lowercase;
+	text-shadow: 0px -1px 1px #000;
+
+	background: #2a2a2a;
+	
+	-webkit-border-top-left-radius: 6px;
+	-moz-border-radius-topleft: 6px;
+	border-top-left-radius: 6px;	
+
+	-webkit-border-top-right-radius: 6px;
+	-moz-border-radius-topright: 6px;
+	border-top-right-radius: 6px;	
+}
+.header ul li.selected {
+	background: #eee url("http://static.tumblr.com/xcxngn2/Iz0ld1v2h/bg.png") repeat;
+}
+.header ul li a {
+	color: #fff;
+	text-decoration: none;
+}
+.header ul li.selected a {
+	color: #000;
+	text-shadow: 0 1px 0 #fff;
+}
+.header ul li.right {
+	float: right;
+}
+
+
+
+#nav {
+	list-style-type: none;
+	float: right;
+	position: relative;
+	top: -22px;
+}
+#nav li {
+	float: left;
+	margin: 0 0 0 10px;
+}
+#nav li a,
+#footer .search input[type=submit] {
+	font-size: 11.5px;
+	background: #00A5F8; /* old browsers */
+	background: -moz-linear-gradient(top, #00A5F8 0%, #0581D2 100%); /* firefox */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#00A5F8), color-stop(100%,#0581D2)); /* webkit */
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#00A5F8', endColorstr='#0581D2',GradientType=0 ); /* ie */
+	text-decoration: none;
+	font-weight: normal;
+	border: 1px solid #0083c5;
+	border-radius: 20px;
+	-moz-border-radius: 20px;
+	-webkit-border-radius: 20px;
+	padding: 5px 15px;
+	color: #fff;
+	text-shadow: 0px 1px 1px rgba(0,0,0,0.5);
+	-moz-box-shadow: 0 1px 0px #58c7ff inset;
+	-webkit-box-shadow: 0 1px 0px #58c7ff inset;
+	box-shadow: 0 1px 0px #58c7ff inset;
+	font-family: "Lucida Sans","Lucida Grande",Verdana,Sans-serif;
+}
+#nav li a:hover,
+#footer .search input[type=submit]:hover {
+	opacity: 0.9;
+}
+#nav li a:focus,
+#footer .search input[type=submit]:focus {
+	opacity: 1;
+	-moz-box-shadow: 0 2px 3px rgba(0,0,0,0.3) inset;
+    -webkit-box-shadow: 0 2px 3px rgba(0,0,0,0.3) inset;
+    box-shadow: 0 2px 3px rgba(0,0,0,0.3) inset;
+}
+#contents .post {
+	clear: right;
+	position: relative;
+	margin-bottom: 40px;
+}
+.content p {
+	margin: 10px 0 !important;
+	position: relative;
+}
+.content .note {
+	border-bottom: 1px solid #ddd;
+	border-top: 1px solid #ddd;
+	padding: 10px 30px;
+	font-size: 0.9em;	
+	text-align: center;
+	margin: 20px 0;
+}
+.content .go h3 {
+	font-size: 24px !important;
+}
+.content h4 {
+	margin-top: 2em;
+	font-size: 15px;
+}
+.content ul {
+	list-style-type: disc;
+}
+.content table {
+	width: 100%;
+	margin: 16px 0;
+}
+.content table th {
+	text-align: left;
+	border: 1px solid #ddd;
+	padding: 2px 4px;
+	background: #f6f6f6;
+}
+.content table td {
+	border: 1px solid #ddd;
+	padding: 2px 4px;
+}
+.description {
+	padding: 10px 0 0 0;
+}
+.description p {
+	margin: 0 !important;
+}
+#contents .post:first-child {
+border-top:0 none;
+}
+.post .sidebar {
+float:right;
+padding: 20px 0 0;
+width: 140px;
+
+/*
+position:absolute;
+right:0;
+top:0;
+*/
+letter-spacing: 0;
+font-size: 11px;
+}
+.sidebar ul {
+	list-style-type: none;
+}
+.sidebar ul li {
+	background:url("http://static.tumblr.com/xcxngn2/cX9ld1v64/li-border.png") no-repeat scroll right bottom transparent;
+font-weight:bold;
+line-height:20px;
+padding:5px 10px;
+}
+.sidebar ul li.notes a {
+	background: url("http://static.tumblr.com/xcxngn2/MZtld1v83/notes.png") no-repeat 0 1px;
+	padding: 1px 0 5px 22px;
+}
+.sidebar ul li.permalink a {
+	background: url("http://static.tumblr.com/xcxngn2/D4qld1v8r/permalink.png") no-repeat 0 0;
+	padding: 1px 0 5px 22px;
+}
+.sidebar ul li.comments a {
+	background: url("http://static.tumblr.com/xcxngn2/Ojslm7i2m/comments.png") no-repeat 0 0;
+	padding: 1px 0 5px 22px;
+}
+.sidebar ul li.tweet a {
+	background: url("http://static.tumblr.com/xcxngn2/hYZlm7i52/tweet.png") no-repeat 0 0;
+	padding: 1px 0 5px 22px;
+}
+.sidebar ul li.date {
+	background: url("http://static.tumblr.com/xcxngn2/JDMld1v4b/date-bg.png") no-repeat 0 0;
+	padding: 14px 0 14px 30px;
+	width: 210px;
+}
+.sidebar ul li.date h2 {
+	color: #ffffff;
+	font-weight:bold;
+	text-shadow: 0 1px 2px #000;
+	font-size: 14px;
+}
+.sidebar ul li.notes {
+	margin: 0;
+}
+.post .sidebar a {
+color:#555555;
+text-decoration:none;
+}
+.post .sidebar a:hover {
+	color: #3b3b3b;
+}
+.post .sidebar p.notes + p {
+margin:0;
+}
+.post .content {
+background:none repeat scroll 0 0 #FFFFFF;
+margin-right:23.5em;
+padding: 30px;
+width: 400px;
+box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
+-moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
+-webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
+border: 4px solid #FCFCFC;
+
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+}
+
+.description + .description {
+margin-top:0;
+}
+#footer {
+padding: 0 0 20px 0;
+}
+#footer .description {
+    float: left;
+    padding-bottom: 1.2em;
+    width: 350px;
+}
+
+.footer-wrap {
+	background: #ffffff;
+	width: 100%;
+	float: left;
+	border-top: 1px solid #ddd;
+}
+.footer {
+	clear:both;
+	margin-bottom:0px;
+	margin-top: 10px;
+	padding: 30px 0;
+	text-align:center;
+	margin: 0 auto;
+    position: relative;
+    width: 700px;
+    color: #ccc;
+    font-size: 0.8em;
+}
+.footer a {
+	color: #aaa;
+}
+#footer .search {
+    float: left;
+    margin-left: 50px;
+    padding-bottom: 30px;
+    width: 300px;
+}
+#footer .search input[type="text"] {
+	background: url("http://static.tumblr.com/xcxngn2/rCqld1v59/input_bg.gif") repeat-x scroll center top #FFFFFF;
+	border: 1px solid #BBBBBB;
+	font: 120% Helvetica,Arial,sans-serif;
+	margin-right: 0.5em;
+	padding: 6px;
+	width: 180px;
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+}
+
+#footer h2 {
+	color: #3b3b3b;
+	font-size: 1.7em;
+	line-height: 1.5em;
+	margin-bottom: 5px;
+	letter-spacing: -1px;
+}
+#footer .description p {
+	color: #555555;
+	margin-top: 0 !important;
+}
+#footer .description img {
+float:left;
+margin-right:10px;
+}
+#footer .follow ul li {
+float:left;
+list-style:none outside none;
+margin-right:2px;
+}
+.post h3 {
+	font-family: 'Alfa Slab One', Arial;
+	color: #3b3b3b;
+	display: block;
+	font-size: 35px;
+	line-height: 120%;
+	margin: 0 0 14px;
+	font-weight: normal;
+}
+.post h3 a {
+	text-decoration: none;
+}
+.post h3 a:hover {
+	color: #3B3B3B;
+}
+.post blockquote {
+border-left: 4px double #CCCCCC;
+padding-left:1em;
+}
+.post blockquote h3 {
+
+}
+.post p, .post blockquote, .post ul, .post ol {
+margin-top:1em;
+}
+.post p:first-child, .post blockquote:first-child, .post ul:first-child, .post ol:first-child {
+margin-top:0;
+}
+.post .nav {
+min-height:0 !important;
+}
+.post .link h3 {
+margin:0;
+}
+.post .quote .symbol {
+float:left;
+font-size:5em;
+margin-top:-0.1em;
+}
+.post .quote .quote {
+font-size:1.7em;
+line-height:1.5em;
+margin-left:1.5em;
+}
+.post .chat ul {
+list-style:none outside none;
+}
+.post .chat ul li {
+font-size:1.2em;
+line-height:1.5em;
+padding:0.25em 0.5em;
+}
+.post .chat ul li {
+background:none repeat scroll 0 0 #FFFFFF;
+}
+.post .chat ul li.odd {
+background: #EEEEEE;
+}
+.post .chat .label {
+color:#999999;
+font-weight:bold;
+}
+.post .chat .odd .label {
+color: #3B3B3B;
+}
+.post .text .go img {
+max-width:100%;
+}
+.post .text blockquote {
+line-height:1.5em;
+}
+.post .text ul, .post .text ol, .post .description ol, .post .description ul {
+padding-left:2.5em;
+}
+ol.notes {
+list-style-type:none;
+margin:0;
+padding:0;
+}
+ol.notes li.note {
+background:none repeat scroll 0 0 #EEEEEE;
+border-top:1px solid #DDDDDD;
+padding:10px;
+}
+ol.notes li.note img.avatar {
+height:16px;
+margin-right:10px;
+vertical-align:-4px;
+width:16px;
+}
+ol.notes li.note span.action {
+font-weight:bold;
+}
+ol.notes li.note .answer_content {
+font-weight:normal;
+}
+ol.notes li.note blockquote {
+border-color:#EEEEEE;
+margin:10px 0 0 25px;
+padding:4px 10px;
+}
+ol.notes li.note blockquote a {
+text-decoration:none;
+}
+
+.text-post,
+.image-post,
+.quote-post,
+.link-post,
+.video-post,
+.chat-post,
+.audio-post {
+	width: 49px;
+	height: 40px;
+	text-indent: -9999em;
+	position: absolute;
+	top: 25;
+	left: -45px;
+}
+.text-post {
+	background: url("http://static.tumblr.com/xcxngn2/tRold1ve5/text.png") no-repeat;
+}
+.image-post {
+	background: url("http://static.tumblr.com/xcxngn2/Dpold1v9c/photo.png") no-repeat;
+}
+img.image {
+	opacity: 0;
+}
+
+span.image-wrap {
+	display: block;
+	width: 100%;
+	height: 100%;
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	box-shadow: 0 0 3px rgba(0, 0, 0, 0.25) inset;
+	-moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.25) inset;
+	-webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.25) inset;
+	position: relative;
+}
+
+.quote-post {
+	background: url("http://static.tumblr.com/xcxngn2/oJ5ld1vb7/quote.png") no-repeat;
+}
+.link-post {
+	background: url("http://static.tumblr.com/xcxngn2/MbRld1v6s/link.png") no-repeat;
+}
+.video-post {
+	background: url("http://static.tumblr.com/xcxngn2/4S8ld1veq/video.png") no-repeat;
+}
+.chat-post {
+	background: url("http://static.tumblr.com/xcxngn2/Aikld1v3n/chat.png") no-repeat;
+}
+.audio-post {
+	background: url("http://static.tumblr.com/xcxngn2/POLlm7i1v/audio.png") no-repeat;
+}
+p.tags {
+	padding-left: 22px;
+	line-height: 25px !important;
+	margin-top: 10px !important;
+	margin-left: 10px;
+	background: url("http://static.tumblr.com/xcxngn2/KXPld1vdg/tags.png") no-repeat 0 5px;
+	word-wrap: break-word;
+}
+p.tags a {
+	padding: 5px 9px;
+	background: #ddd;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+	margin-right: 3px;
+}
+div.quote {
+	background-color: #dc4f1b !important;
+	border-color: #dc4f1b !important;
+	color: #000;
+	text-shadow: none;
+}
+div.quote h4 {
+    color: #fff !important;
+    font-family: "League Gothic", Impact, Helvetica Neue, Helvetica, Arial, sans-serif;
+	font-family: 'Alfa Slab One', Arial;
+    font-size: 28px !important;
+    font-weight: normal;
+    line-height: 120% !important;
+    margin: 0 !important;
+    xxxtext-shadow: 0 1px 0 #dc4f1b;
+    text-transform: uppercase;
+}
+div.quote a {
+	color: #000;
+	text-decoration: none;
+	text-shadow: none;
+}
+.footer-nav {
+	margin-right:23.5em;
+	min-height:0 !important;
+	padding: 0px;
+	width: 460px;
+}
+.sidebar img.portrait {
+	float: left;
+	margin-right: 10px;
+}
+a.previous-page {
+	background: url("http://static.tumblr.com/xcxngn2/ifPld1v9u/previous.png") no-repeat;
+	height: 40px;
+	width: 40px;
+	text-indent: -9999em;
+	display: block;
+	float: left;
+}
+a.next-page {
+	background: url("http://static.tumblr.com/xcxngn2/1dRld1v7e/next.png") no-repeat;
+	height: 40px;
+	width: 40px;
+	text-indent: -9999em;
+	display: block;
+	float: right;
+}
+a.next-page:focus,
+a.previous-page:focus {
+	position: relative;
+	top: 1px;
+}
+.notes {
+	clear: right;
+	position: relative;
+	margin-bottom: 45px;
+}
+#disqus_thread,
+ol.notes {
+	background: none repeat scroll 0 0 #FFFFFF;
+    border: 4px solid #FCFCFC;
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
+    -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
+    -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); 
+    margin-right: 23.5em;
+    padding: 30px;
+    width: 400px;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+}
+.dsq-item-trackback {
+	background: #EEE !important;
+	padding: 10px !important;
+	margin: 0 !important;
+}
+img.me {
+	float: right;
+	margin: 0 0 0 20px;
+}
+.clear-div {
+	clear: both;
+}	
+.clear {
+	clear: both;
+	display: block;
+	overflow: hidden;
+	visibility: hidden;
+	width: 0;
+	height: 0;
+}
+
+/* http://perishablepress.com/press/2009/12/06/new-clearfix-hack */
+
+.clearfix:after {
+	clear: both;
+	content: ' ';
+	display: block;
+	font-size: 0;
+	line-height: 0;
+	visibility: hidden;
+	width: 0;
+	height: 0;
+}
+
+/*
+	The following zoom:1 rule is specifically for IE6 + IE7.
+	Move to separate stylesheet if invalid CSS is a problem.
+*/
+* html .clearfix,
+*:first-child+html .clearfix {
+	zoom: 1;
+}
+.audio span.image-wrap {
+    border-radius: 5px;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+    box-shadow: 0 0 3px rgba(0, 0, 0, 0.35) inset;
+    -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.35) inset;
+    -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.35) inset;
+    display: block;
+    width: 145px;
+    height: 145px;
+    float: left;
+    position: relative;
+    margin: 0 25px 0 0;
+}
+img.cover {
+	width: 145px;
+	opacity: 0;
+}
\ No newline at end of file

From 81ad983cea3695556999adad37c91df278ee0f7a Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 21 Oct 2012 19:20:37 +0200
Subject: [PATCH 075/174] Add non-prefixed gradients

---
 css/main.css | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/css/main.css b/css/main.css
index bf92ada6..0be325d1 100644
--- a/css/main.css
+++ b/css/main.css
@@ -21,6 +21,7 @@ body {
 	background: #454545 -moz-radial-gradient(center 400px, circle, #707070 50px, #454545 300px);	
 	background: #454545 -ms-radial-gradient(center 400px, circle, #707070 50px, #454545 300px);	
 	background: #454545 -o-radial-gradient(center 400px, circle, #707070 50px, #454545 300px);	
+	background: #454545 radial-gradient(center 400px, circle, #707070 50px, #454545 300px);	
 	background-repeat: no-repeat;
 }
 
@@ -31,6 +32,7 @@ body {
 	background: #222 -moz-linear-gradient(top, #111, #222);
 	background: #222 -ms-linear-gradient(top, #111, #222);
 	background: #222 -o-linear-gradient(top, #111, #222);
+	background: #222 linear-gradient(top, #111, #222);
 }
 .header h1 {
 	font-weight: bold;
@@ -92,6 +94,7 @@ body {
 	background: #333 -moz-linear-gradient(top, #2a2a2a, #333 16px);
 	background: #333 -ms-linear-gradient(top, #2a2a2a, #333 16px);
 	background: #333 -o-linear-gradient(top, #2a2a2a, #333 16px);
+	background: #333 linear-gradient(top, #2a2a2a, #333 16px);
 }
 .footer > div {
 	margin: 0 auto;
@@ -439,6 +442,7 @@ body {
 	background: #fff -moz-linear-gradient(top, #fff, #f3f3f3);
 	background: #fff -ms-linear-gradient(top, #fff, #f3f3f3);
 	background: #fff -o-linear-gradient(top, #fff, #f3f3f3);
+	background: #fff linear-gradient(top, #fff, #f3f3f3);
 }
 
 
@@ -576,6 +580,7 @@ body {
 	background: #f0f0f0 -moz-linear-gradient(top, #e6e6e6, #f6f6f6 50%, #e6e6e6 50%, #f6f6f6);
 	background: #f0f0f0 -ms-linear-gradient(top, #e6e6e6, #f6f6f6 50%, #e6e6e6 50%, #f6f6f6);
 	background: #f0f0f0 -o-linear-gradient(top, #e6e6e6, #f6f6f6 50%, #e6e6e6 50%, #f6f6f6);
+	background: #f0f0f0 linear-gradient(top, #e6e6e6, #f6f6f6 50%, #e6e6e6 50%, #f6f6f6);
 }
 .rankingPanel dl#winner {
 	background: #e04f2e;
@@ -583,6 +588,7 @@ body {
 	background: #e04f2e -moz-linear-gradient(top, #ec6534, #e04f2e 50%, #ec6534 50%, #e04f2e);
 	background: #e04f2e -ms-linear-gradient(top, #ec6534, #e04f2e 50%, #ec6534 50%, #e04f2e);
 	background: #e04f2e -o-linear-gradient(top, #ec6534, #e04f2e 50%, #ec6534 50%, #e04f2e);
+	background: #e04f2e linear-gradient(top, #ec6534, #e04f2e 50%, #ec6534 50%, #e04f2e);
 	padding-left: 38px;
 }
 .rankingPanel dl#winner::before {
@@ -720,6 +726,7 @@ body {
 	background: #f0f0f0 -moz-linear-gradient(top, #e6e6e6, #f6f6f6 43px, #d6d6d6 43px, #f0f0f0);
 	background: #f0f0f0 -ms-linear-gradient(top, #e6e6e6, #f6f6f6 43px, #d6d6d6 43px, #f0f0f0);
 	background: #f0f0f0 -o-linear-gradient(top, #e6e6e6, #f6f6f6 43px, #d6d6d6 43px, #f0f0f0);
+	background: #f0f0f0 linear-gradient(top, #e6e6e6, #f6f6f6 43px, #d6d6d6 43px, #f0f0f0);
 }
 .resultsTable table thead th {
 	padding: 3px 10px;
@@ -779,6 +786,7 @@ body {
 	background: #aaa -moz-linear-gradient(top, #888, #999 40%, #aaa);
 	background: #aaa -ms-linear-gradient(top, #888, #999 40%, #aaa);
 	background: #aaa -o-linear-gradient(top, #888, #999 40%, #aaa);
+	background: #aaa linear-gradient(top, #888, #999 40%, #aaa);
 
 	-webkit-border-radius: 6px;
 	-moz-border-radius: 6px;

From 0390c2c709b123342aa97f93273aafd2fa5002c2 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 21 Oct 2012 19:20:55 +0200
Subject: [PATCH 076/174] Update style of 'updated' banner

---
 css/main.css | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/css/main.css b/css/main.css
index 0be325d1..edfb18fa 100644
--- a/css/main.css
+++ b/css/main.css
@@ -183,16 +183,17 @@ body {
 	-o-box-shadow: 0px 0px 5px #222;
 	box-shadow: 0px 0px 5px #222;
 
-	-webkit-transform: rotate(10deg);
-	-moz-transform: rotate(10deg);
-	-ms-transform: rotate(10deg);
-	-o-transform: rotate(10deg);
+	-webkit-transform: rotate(-10deg);
+	-moz-transform: rotate(-10deg);
+	-ms-transform: rotate(-10deg);
+	-o-transform: rotate(-10deg);
+	transform: rotate(-10deg);
 
 	text-shadow: 0px -1px 1px #852706;
 
 	font-family: 'Alfa Slab One', Arial;
 	font-weight: normal;
-	font-size: 1.4em;
+	font-size: 1.1em;
 	text-transform: uppercase;
 	color: #eee;
 	text-align: center;

From 7ccb6363e3600af567bf878f38d30c918b0579a8 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 21 Oct 2012 19:27:21 +0200
Subject: [PATCH 077/174] Share panel disappeared when the window was between
 640 and 480 pixels wide

---
 css/main.css | 72 ++++++++++++++++++++++++++--------------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/css/main.css b/css/main.css
index edfb18fa..6ec223eb 100644
--- a/css/main.css
+++ b/css/main.css
@@ -1444,6 +1444,42 @@ body {
 	.paper > div dl#upcoming {
 		display: none;
 	}
+
+	#share {
+		position: relative;
+		right: auto;
+		top: auto;
+		
+		width: 100%;
+		opacity: 1;
+		margin: -10px 0 20px;
+	}
+	#share::after {
+		top: -8px;
+		left: 50%;;
+		right: auto;
+		margin: 0 0 0 -10px;
+
+		border-top: none;
+		border-left: 10px solid transparent;
+		border-right: 10px solid transparent;
+		border-bottom: 10px solid #f0f0f0;
+	}
+	#share #twitter {
+		left: 50%;
+		right: auto;
+		margin: 0 0 0 -100px;
+	}
+	#share #facebook {
+		left: 50%;
+		right: auto;
+		margin: 0 0 0 -28px;
+	}
+	#share #google {
+		left: 50%;
+		right: auto;
+		margin: 0 0 0 40px;
+	}
 }
 
 @media (max-width: 480px) {
@@ -1485,42 +1521,6 @@ body {
 	.resultsTable table thead td span.bonus span {
 		display: none;
 	}
-	
-	#share {
-		position: relative;
-		right: auto;
-		top: auto;
-		
-		width: 100%;
-		opacity: 1;
-		margin: -10px 0 20px;
-	}
-	#share::after {
-		top: -8px;
-		left: 50%;;
-		right: auto;
-		margin: 0 0 0 -10px;
-
-		border-top: none;
-		border-left: 10px solid transparent;
-		border-right: 10px solid transparent;
-		border-bottom: 10px solid #f0f0f0;
-	}
-	#share #twitter {
-		left: 50%;
-		right: auto;
-		margin: 0 0 0 -100px;
-	}
-	#share #facebook {
-		left: 50%;
-		right: auto;
-		margin: 0 0 0 -28px;
-	}
-	#share #google {
-		left: 50%;
-		right: auto;
-		margin: 0 0 0 40px;
-	}
 }
 @media (max-width: 360px) {
 	.header h1 {

From b4dac4933bf8827d2bb03c708ec399aebb031783 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 21 Oct 2012 21:37:03 +0200
Subject: [PATCH 078/174] Make sure text is not displayed on top of cloudvps
 logo

---
 css/main.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/css/main.css b/css/main.css
index 6ec223eb..9b6bf071 100644
--- a/css/main.css
+++ b/css/main.css
@@ -1405,6 +1405,11 @@ body {
 	}
 	.footer > div .copyright {
 		margin-left: 50px;
+		margin-right: 116px;
+	}
+
+	#cloudvps a {
+		right: 16px;
 	}
 
 	.page {

From d1804585fa6e1f39b64b9ca5e1d2765d9c526f8e Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 21 Oct 2012 21:38:35 +0200
Subject: [PATCH 079/174] Use a different style of top menu on small devices

---
 about.html                     |  21 ++++---
 backend/templates/browser.html |  21 ++++---
 backend/templates/feature.html |  21 ++++---
 backend/templates/results.html |  21 ++++---
 css/main.css                   | 112 +++++++++++++++++++++++++--------
 donate.html                    |  21 ++++---
 index.html                     |  19 +++---
 7 files changed, 157 insertions(+), 79 deletions(-)

diff --git a/about.html b/about.html
index 602067a6..e7e5f4a4 100644
--- a/about.html
+++ b/about.html
@@ -48,17 +48,20 @@
 	<body>
 		<div class='header'>
 			<h1 data-i18n>The HTML5 test <em>&ndash; how well does your browser support HTML5?</em></h1>
-			<ul>
-				<li><a href='/index.html' data-i18n>Your browser</a></li>
-				<li><a href='/results/desktop.html' data-i18n>Other<span> browser</span>s</a></li>
-				<li><a href='/compare/browser/index.html' data-i18n>Compare</a></li>
-
-				<li class='right selected'><a href='/about.html' data-i18n>About<span> the test</span></a></li>
-				<li class='right'><a href='http://blog.html5test.com/' data-i18n>News</a></li>
-			</ul>
+			<div class='navigation'>
+				<ul class='left'>
+					<li><a href='/index.html' data-i18n>Your browser</a></li>
+					<li><a href='/results/desktop.html' data-i18n>Other<span> browser</span>s</a></li>
+					<li><a href='/compare/browser/index.html' data-i18n>Compare</a></li>
+				</ul>
+				<ul class='right'>
+					<li><a href='http://blog.html5test.com/' data-i18n>News</a></li>
+					<li class='selected'><a href='/about.html' data-i18n>About<span> the test</span></a></li>
+				</ul>
+			</div>
 		</div>
 		
-		<div class='page'>
+		<div class='page hasNavigation'>
 			<div class='paper'>
 				<ul>
 					<li class='selected'><a href='about.html' data-i18n>Frequently asked questions</a></li>
diff --git a/backend/templates/browser.html b/backend/templates/browser.html
index e1edde55..3a177a83 100644
--- a/backend/templates/browser.html
+++ b/backend/templates/browser.html
@@ -28,17 +28,20 @@
 	<body>
 		<div class='header'>
 			<h1 data-i18n>The HTML5 test <em>&ndash; how well does your browser support HTML5?</em></h1>
-			<ul>
-				<li><a href='/index.html' data-i18n>Your browser</a></li>
-				<li><a href='/results/desktop.html' data-i18n>Other<span> browser</span>s</a></li>
-				<li class='selected'><a href='/compare/browser/index.html' data-i18n>Compare</a></li>
-
-				<li class='right'><a href='/about.html' data-i18n>About<span> the test</span></a></li>
-				<li class='right'><a href='http://blog.html5test.com/' data-i18n>News</a></li>
-			</ul>
+			<div class='navigation'>
+				<ul class='left'>
+					<li><a href='/index.html' data-i18n>Your browser</a></li>
+					<li><a href='/results/desktop.html' data-i18n>Other<span> browser</span>s</a></li>
+					<li class='selected'><a href='/compare/browser/index.html' data-i18n>Compare</a></li>
+				</ul>
+				<ul class='right'>
+					<li><a href='http://blog.html5test.com/' data-i18n>News</a></li>
+					<li><a href='/about.html' data-i18n>About<span> the test</span></a></li>
+				</ul>
+			</div>
 		</div>
 		
-		<div class='page'>
+		<div class='page hasNavigation'>
 			<div class='paper'>
 				<ul>
 					<li class='selected'><a href='/compare/browser/index.html' data-i18n>Browsers</a></li>
diff --git a/backend/templates/feature.html b/backend/templates/feature.html
index 00ccf67f..fdfdfeef 100644
--- a/backend/templates/feature.html
+++ b/backend/templates/feature.html
@@ -26,17 +26,20 @@
 	<body>
 		<div class='header'>
 			<h1 data-i18n>The HTML5 test <em>&ndash; how well does your browser support HTML5?</em></h1>
-			<ul>
-				<li><a href='/index.html' data-i18n>Your browser</a></li>
-				<li><a href='/results/desktop.html' data-i18n>Other<span> browser</span>s</a></li>
-				<li class='selected'><a href='/compare/browser/index.html' data-i18n>Compare</a></li>
-
-				<li class='right'><a href='/about.html' data-i18n>About<span> the test</span></a></li>
-				<li class='right'><a href='http://blog.html5test.com/' data-i18n>News</a></li>
-			</ul>
+			<div class='navigation'>
+				<ul class='left'>
+					<li><a href='/index.html' data-i18n>Your browser</a></li>
+					<li><a href='/results/desktop.html' data-i18n>Other<span> browser</span>s</a></li>
+					<li class='selected'><a href='/compare/browser/index.html' data-i18n>Compare</a></li>
+				</ul>
+				<ul class='right'>
+					<li><a href='http://blog.html5test.com/' data-i18n>News</a></li>
+					<li><a href='/about.html' data-i18n>About<span> the test</span></a></li>
+				</ul>
+			</div>
 		</div>
 		
-		<div class='page'>
+		<div class='page hasNavigation'>
 			<div class='paper'>
 				<ul>
 					<li><a href='/compare/browser/index.html' data-i18n>Browsers</a></li>
diff --git a/backend/templates/results.html b/backend/templates/results.html
index cb360937..5fd2e8e9 100644
--- a/backend/templates/results.html
+++ b/backend/templates/results.html
@@ -28,17 +28,20 @@
 	<body>
 		<div class='header'>
 			<h1 data-i18n>The HTML5 test <em>&ndash; how well does your browser support HTML5?</em></h1>
-			<ul>
-				<li><a href='/index.html' data-i18n>Your browser</a></li>
-				<li class='selected'><a href='/results/desktop.html' data-i18n>Other<span> browser</span>s</a></li>
-				<li><a href='/compare/browser/index.html' data-i18n>Compare</a></li>
-
-				<li class='right'><a href='/about.html' data-i18n>About<span> the test</span></a></li>
-				<li class='right'><a href='http://blog.html5test.com/' data-i18n>News</a></li>
-			</ul>
+			<div class='navigation'>
+				<ul class='left'>
+					<li><a href='/index.html' data-i18n>Your browser</a></li>
+					<li class='selected'><a href='/results/desktop.html' data-i18n>Other<span> browser</span>s</a></li>
+					<li><a href='/compare/browser/index.html' data-i18n>Compare</a></li>
+				</ul>
+				<ul class='right'>
+					<li><a href='http://blog.html5test.com/' data-i18n>News</a></li>
+					<li><a href='/about.html' data-i18n>About<span> the test</span></a></li>
+				</ul>
+			</div>
 		</div>
 		
-		<div class='page'>
+		<div class='page hasNavigation'>
 			<div class='paper'>
 				<ul>
 					<li class='<?php echo $type == 'desktop' ? 'selected' : ''; ?>'><a data-i18n href='/results/desktop.html'>Desktop<span> browsers</span></a></li>
diff --git a/css/main.css b/css/main.css
index 9b6bf071..a7638a8b 100644
--- a/css/main.css
+++ b/css/main.css
@@ -28,11 +28,11 @@ body {
 
 .header {
 	background: #222;
-	background: #222 -webkit-gradient(linear, left 64, left 80, from(#222), to(#111));
-	background: #222 -moz-linear-gradient(top, #111, #222);
-	background: #222 -ms-linear-gradient(top, #111, #222);
-	background: #222 -o-linear-gradient(top, #111, #222);
-	background: #222 linear-gradient(top, #111, #222);
+	background: #222 -webkit-gradient(linear, left top, left bottom, from(#222), to(#111));
+	background: #222 -moz-linear-gradient(bottom, #111, #222);
+	background: #222 -ms-linear-gradient(bottom, #111, #222);
+	background: #222 -o-linear-gradient(bottom, #111, #222);
+	background: #222 linear-gradient(bottom, #111, #222);
 }
 .header h1 {
 	font-weight: bold;
@@ -49,13 +49,21 @@ body {
 	font-style: normal;
 	color: #666;
 }
-.header ul {
+.header div {
 	margin: 10px auto 0;
+	overflow: hidden;
 	width: 630px;
-	overflow:hidden;
-
+}
+.header ul {
 	list-style-type: none;
 }
+.header ul.left {
+	float: left;
+}
+.header ul.right {
+	float: right;
+}
+
 .header ul li {
 	display: block;
 	float: left;
@@ -84,9 +92,6 @@ body {
 	color: #fff;
 	text-decoration: none;
 }
-.header ul li.right {
-	float: right;
-}
 
 .footer {
 	background: #333;
@@ -1380,7 +1385,7 @@ body {
 
 
 
-@media (max-width: 640px) {
+@media (max-width: 680px) {
 	body {
 		padding: 0;
 	}
@@ -1389,11 +1394,18 @@ body {
 		width: auto;
 		padding-left: 30px;
 	}
-	.header ul {
+	
+	.header div {
 		width: auto;
+	}
+	.header ul.left {
 		padding-left: 30px;
-		padding-right: 10px;
 	}
+
+	.header ul.right {
+		padding-right: 30px;
+	}
+
 	.footer > div {
 		width: auto;
 		padding-left: 30px;
@@ -1487,6 +1499,52 @@ body {
 	}
 }
 
+@media (max-width: 560px) {
+	.header h1 {
+		width: 400px;
+		padding-left: 0;
+		padding-right: 0;
+		text-align: center;
+	}
+
+	.header div {
+		width: auto;
+	}
+	.header ul {
+		padding: 0 !important;
+		margin: 0 0 12px 0 !important;
+		width: 50%;
+	}
+	.header ul li {
+		-webkit-border-radius: 6px;
+		-moz-border-radius: 6px;
+		border-radius: 6px;
+
+		line-height: 30px;
+
+		background: none;
+		clear: left;
+	}
+	.header ul.right {
+		padding-left: 10px;
+	}
+	.header ul.left li {
+		float: right;
+		clear: right;
+		margin-right: 6px;
+	}
+	.header ul.right li {
+		margin-left: 6px;
+	}
+	
+	.page.hasNavigation {
+		padding-top: 24px;
+		background: #111;
+		margin: 0;
+	}
+}
+
+
 @media (max-width: 480px) {
 	.comparisonTable table tr :nth-child(4) {
 		display: none;
@@ -1520,28 +1578,33 @@ body {
 		column-count: 1;
 	}
 
+	/*
 	.resultsTable table thead td span.bonus {
 		margin-left: -42px;
 	}
-	.resultsTable table thead td span.bonus span {
-		display: none;
-	}
+	*/
 }
-@media (max-width: 360px) {
+@media (max-width: 432px) {
 	.header h1 {
+		width: auto;
 		padding-left: 16px;
+		padding-right: 16px;
 	}
 	.header ul {
-		padding-left: 16px;
 		font-size: 0.85em;
 	}
+	.header ul.left {
+		padding-left: 16px;
+	}
 	.header ul li {
 		padding: 0 8px;
+		line-height: 28px;
 	}
+	/*
 	.header ul li span {
 		display: none;
 	}
-
+	*/
 	.scorePanel  h2 {
 		font-size: 8em !important;
 	}
@@ -1553,11 +1616,6 @@ body {
 		width: 90%;
 	}
 	
-	
-	.page {
-		margin-top: 2em;
-	}
-	
 	.paper ul {
 		margin-left: 16px;
 		font-size: 0.8em;	
@@ -1579,7 +1637,9 @@ body {
 		margin: 0 -16px;
 	}	
 
-
+	.resultsTable table thead td span.bonus span {
+		display: none;
+	}
 	
 	.comparisonTable table tr :nth-child(3),
 	.comparisonTable table tr :nth-child(4) {
diff --git a/donate.html b/donate.html
index 09cdabe7..84fcab68 100644
--- a/donate.html
+++ b/donate.html
@@ -60,17 +60,20 @@
 	<body>
 		<div class='header'>
 			<h1 data-i18n>The HTML5 test <em>&ndash; how well does your browser support HTML5?</em></h1>
-			<ul>
-				<li><a href='/index.html' data-i18n>Your browser</a></li>
-				<li><a href='/results/desktop.html' data-i18n>Other<span> browser</span>s</a></li>
-				<li><a href='/compare/browser/index.html' data-i18n>Compare</a></li>
-
-				<li class='right selected'><a href='/about.html' data-i18n>About<span> the test</span></a></li>
-				<li class='right'><a href='http://blog.html5test.com/' data-i18n>News</a></li>
-			</ul>
+			<div class='navigation'>
+				<ul class='left'>
+					<li><a href='/index.html' data-i18n>Your browser</a></li>
+					<li><a href='/results/desktop.html' data-i18n>Other<span> browser</span>s</a></li>
+					<li><a href='/compare/browser/index.html' data-i18n>Compare</a></li>
+				</ul>
+				<ul class='right'>
+					<li><a href='http://blog.html5test.com/' data-i18n>News</a></li>
+					<li class='selected'><a href='/about.html' data-i18n>About<span> the test</span></a></li>
+				</ul>
+			</div>
 		</div>
 		
-		<div class='page'>
+		<div class='page hasNavigation'>
 			<div class='paper'>
 				<ul>
 					<li><a href='about.html' data-i18n>Frequently asked questions</a></li>
diff --git a/index.html b/index.html
index 55b9bd2e..676817b5 100644
--- a/index.html
+++ b/index.html
@@ -78,14 +78,17 @@
 
 		<div class='header'>
 			<h1 data-i18n>The HTML5 test <em>&ndash; how well does your browser support HTML5?</em></h1>
-			<ul>
-				<li class='selected'><a href='/index.html' data-i18n>Your browser</a></li>
-				<li><a href='/results/desktop.html' data-i18n>Other<span> browser</span>s</a></li>
-				<li><a href='/compare/browser/index.html' data-i18n>Compare</a></li>
-
-				<li class='right'><a href='/about.html' data-i18n>About<span> the test</span></a></li>
-				<li class='right'><a href='http://blog.html5test.com/' data-i18n>News</a></li>
-			</ul>
+			<div class='navigation'>
+				<ul class='left'>
+					<li class='selected'><a href='/index.html' data-i18n>Your browser</a></li>
+					<li><a href='/results/desktop.html' data-i18n>Other<span> browser</span>s</a></li>
+					<li><a href='/compare/browser/index.html' data-i18n>Compare</a></li>
+				</ul>
+				<ul class='right'>
+					<li><a href='http://blog.html5test.com/' data-i18n>News</a></li>
+					<li><a href='/about.html' data-i18n>About<span> the test</span></a></li>
+				</ul>
+			</div>
 		</div>
 		
 		<div class='page'>

From 25518e0696bf5b215e3c0e2603f3cd7c8beffae3 Mon Sep 17 00:00:00 2001
From: JohnBear <xiongpeng524_@163.com>
Date: Fri, 9 Nov 2012 13:10:14 +0800
Subject: [PATCH 080/174] Update scripts/useragents.js

Add detecting code for QIHU 360 safe browser.
---
 scripts/useragents.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 90c6e6b7..ea4af243 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -4582,7 +4582,8 @@ var UserAgents = (function(){
 				{ name: 'Songbird', 			regexp: /Songbird\/([0-9.]*)/ },
 				{ name: 'Thunderbird', 			regexp: /Thunderbird\/([0-9.]*)/ },
 
-				{ name: '360 Extreme Explorer', regexp: /360EE/ },
+				{ name: '360 Extreme Explorer', regexp: /QIHU 360EE/ },
+				{ name: '360 Safe Explorer', regexp: /QIHU 360SE/ },
 				{ name: '360 Phone Browser', 	regexp: /360 Android Phone Browser \(V([0-9.]*)\)/ },
 				{ name: 'ABrowse', 				regexp: /Abrowse ([0-9.]*)/ },
 				{ name: 'Abrowser', 			regexp: /Abrowser\/([0-9.]*)/ },

From 3046bd3cdc047e0f1179e767d65e54ef471f2e1a Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 11 Nov 2012 22:55:49 +0100
Subject: [PATCH 081/174] Fix AndroVM detection

---
 scripts/useragents.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 90c6e6b7..938d5754 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -82,7 +82,7 @@ var UserAgents = (function(){
 
 				if (!result.identified) {
 					model = DeviceModels.cleanup(model);
-					if (model.match(/AndroVM/) || model == 'Emulator' || model == 'x86 Emulator' || model == 'x86 VirtualBox' || model == 'vm') {
+					if (model.match(/AndroVM/i) || model == 'Emulator' || model == 'x86 Emulator' || model == 'x86 VirtualBox' || model == 'vm') {
 						return {
 							type:			'emulator',
 							identified:		true,

From 157859ad3c118351205b8dadb38cadf0d71a879c Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 11 Nov 2012 22:56:15 +0100
Subject: [PATCH 082/174] Better cleanup of device names

---
 scripts/useragents.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 938d5754..a9d20dbd 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -103,13 +103,14 @@ var UserAgents = (function(){
 			cleanup: function(s) {
 				s = typeof s == 'undefined' ? '' : s;
 			
+				s = s.replace(/\/[^/]+$/, "");
+				s = s.replace(/\/[^/]+ Android\/.*/, "");
+
 				s = s.replace(/_TD$/, '');
 				s = s.replace(/_CMCC$/, '');
 		
 				s = s.replace(/_/g, " ");
 				s = s.replace(/^\s+|\s+$/g, "");
-				s = s.replace(/\/[^/]+$/, "");
-				s = s.replace(/\/[^/]+ Android\/.*/, "");
 		
 				s = s.replace(/^tita on /, '');
 				s = s.replace(/^ICS AOSP on /, '');
@@ -125,12 +126,12 @@ var UserAgents = (function(){
 				s = s.replace(/^Alcatel OT-(.*)/, 'one touch $1');
 				s = s.replace(/^YL-/, '');
 				s = s.replace(/^Novo7 ?/i, 'Novo7 ');
-				s = s.replace(/^GIONEE /, '');
+				s = s.replace(/^G[iI]ONEE[ -]/, '');
 				s = s.replace(/^HW-/, '');
 				s = s.replace(/^Huawei[ -]/i, 'Huawei ');
 				s = s.replace(/^SAMSUNG[ -]/i, '');
 				s = s.replace(/^(Sony ?Ericsson|Sony)/, '');
-				s = s.replace(/^(Lenovo Lenovo|LNV-Lenovo)/, 'Lenovo');
+				s = s.replace(/^(Lenovo Lenovo|LNV-Lenovo|LENOVO-Lenovo)/, 'Lenovo');
 				s = s.replace(/^Lenovo-/, 'Lenovo ');
 				s = s.replace(/^ZTE-/, 'ZTE ');
 				s = s.replace(/^(LG)[ _\/]/, '$1-');

From e8bab30cecc73d3ec8b781a44cb6b62af12be19c Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 11 Nov 2012 23:02:55 +0100
Subject: [PATCH 083/174] Many, many new devices

---
 scripts/useragents.js | 453 ++++++++++++++++++++++++++++--------------
 1 file changed, 300 insertions(+), 153 deletions(-)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index a9d20dbd..392d804b 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -218,18 +218,31 @@ var UserAgents = (function(){
 			'pnx8473 kiryung':							[ 'Trident', 'PNX8473' + STRINGS_BASED, TYPE_TELEVISION ],
 			
 			/* Official Google development devices */
-			'Crespo!':									[ 'Google', 'Nexus S' ],
-			'Passion':									[ 'Google', 'Nexus One' ],
 			'Bravo':									[ STRINGS_HTC, 'Desire' ],
 			'Dream':									[ STRINGS_HTC, 'Dream' ],
 			'Vogue':									[ STRINGS_HTC, 'Touch' ],
 			'Vendor Optimus':							[ STRINGS_LG, 'Optimus' ],
 			'Stingray':									[ STRINGS_MOTOROLA, 'XOOM', TYPE_TABLET ],
 			'Wingray':									[ STRINGS_MOTOROLA, 'XOOM', TYPE_TABLET ],
-			'Maguro':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
-			'Toro-VZW':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
 			'Blaze':									[ STRINGS_TI, 'Blaze Tablet', TYPE_TABLET ],
 			'Blaze Tablet':								[ STRINGS_TI, 'Blaze Tablet', TYPE_TABLET ],
+			'Google Ion':								[ 'Google', 'Ion' ],
+
+
+			/* Nexus Devices (without official model no. */
+			'Passion':									[ STRINGS_HTC, 'Nexus One' ],
+			'(HTC )?Nexus ?One!':						[ STRINGS_HTC, 'Nexus One' ],
+			'Crespo!':									[ STRINGS_SAMSUNG, 'Nexus S' ],
+			'(Google )?Nexus S!':						[ STRINGS_SAMSUNG, 'Nexus S' ],
+			'Dooderbutt!':								[ STRINGS_SAMSUNG, 'Nexus S' ],
+			'Maguro':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
+			'Toro-VZW':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
+			'Galaxy Nexus':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
+			'(Google )?Nexus 7!':						[ STRINGS_ASUS, 'Nexus 7', TYPE_TABLET ],
+			'Nexus 4':									[ STRINGS_LG, 'Nexus 4' ],
+			'manta':									[ STRINGS_SAMSUNG, 'Nexus 10', TYPE_TABLET ],
+			'Nexus 10':									[ STRINGS_SAMSUNG, 'Nexus 10', TYPE_TABLET ],
+
 			
 			/* Middleware and emulators */
 			'BlueStacks':								[ 'BlueStacks', 'App Player', 'desktop' ],
@@ -307,7 +320,10 @@ var UserAgents = (function(){
 			'(Amazon )?Kindle Fire!':					[ 'Amazon', 'Kindle Fire', TYPE_TABLET ],
 			'KFOT':										[ 'Amazon', 'Kindle Fire', TYPE_TABLET ],	
 			'KFTT':										[ 'Amazon', 'Kindle Fire HD 7"', TYPE_TABLET ],
-			'WFJW[IA]!':								[ 'Amazon', 'Kindle Fire HD 8.9"', TYPE_TABLET ],
+			'KFJW(I|A)!':								[ 'Amazon', 'Kindle Fire HD 8.9"', TYPE_TABLET ],
+			'AMOI N89':									[ 'Amoi', 'N89' ],
+			'AMOI N820':								[ 'Amoi', 'N820' ],
+			'AMOI N821':								[ 'Amoi', 'N821' ],
 			'AMD120':									[ 'AnyDATA', 'AnyTAB AMD120', TYPE_TABLET ],
 			'MW0811':									[ 'AOC', 'Breeze MW0811', TYPE_TABLET ],
 			'MW0821 V2.0':								[ 'AOC', 'Breeze MW0821', TYPE_TABLET ],
@@ -350,17 +366,21 @@ var UserAgents = (function(){
 			'Transformer (Pad )?TF300(T|TG|TL)!':		[ STRINGS_ASUS, 'Transformer Pad 300', TYPE_TABLET ],
 			'Transformer (Pad )?TF700(T|K)!':			[ STRINGS_ASUS, 'Transformer Pad Infinity 700', TYPE_TABLET ],
 			'PadFone':									[ STRINGS_ASUS, 'Padfone', TYPE_TABLET ],
+			'PadFone 2':								[ STRINGS_ASUS, 'Padfone 2', TYPE_TABLET ],
 			'OMS TTD':									[ STRINGS_ASUS, 'Eee Pc T10' ],
 			'ASUS T20':									[ STRINGS_ASUS, 'Eee Pc T20' ],
 			'ETBW11AA':									[ STRINGS_ASUS, 'Tough' ],
 			'AUX V900':									[ 'AUX', 'V900' ],
 			'PICOpad-QGN':								[ 'Axioo', 'Picopad QGN', TYPE_TABLET ],
 			'NOOK':										[ STRINGS_BN, 'NOOK', TYPE_EREADER ],
-			'Nook ?Color':								[ STRINGS_BN, 'NOOK Color', TYPE_EREADER ],
+			'Nook ?Color!':								[ STRINGS_BN, 'NOOK Color', TYPE_EREADER ],
 			'(NOOK )?BNRV(200|300)!':					[ STRINGS_BN, 'NOOK Color', TYPE_EREADER ],
 			'Nook ?Tablet!':							[ STRINGS_BN, 'NOOK Tablet', TYPE_EREADER ],
 			'(NOOK )?BNTV250!':							[ STRINGS_BN, 'NOOK Tablet', TYPE_EREADER ],
 			'NOOK Slate':								[ STRINGS_BN, 'NOOK Tablet', TYPE_EREADER ],
+			'Barnes & Noble Nook Tablet':				[ STRINGS_BN, 'NOOK Tablet', TYPE_EREADER ],
+			'(NOOK )?BNTV(400)!':						[ STRINGS_BN, 'NOOK HD Tablet', TYPE_EREADER ],
+			'(NOOK )?BNTV(600)!':						[ STRINGS_BN, 'NOOK HD+ Tablet', TYPE_EREADER ],
 			'BenWee 5100':								[ 'BenWee', '5100' ],
 			'CA907AAC0G':								[ 'Besta', 'CA907AAC0G' ],
 			'BM999':									[ 'Bmorn', 'BM999', TYPE_TABLET ],
@@ -419,7 +439,8 @@ var UserAgents = (function(){
 			'5860':										[ STRINGS_COOLPAD, '5860' ],
 			'Coolpad 5870':								[ STRINGS_COOLPAD, '5870' ],
 			'Coolpad 7005':								[ STRINGS_COOLPAD, '7005' ],
-			'Coolpad 7019':								[ STRINGS_COOLPAD, '7019' ],
+			'Coolpad 7019!':							[ STRINGS_COOLPAD, '7019' ],
+			'Coolpad 7230':								[ STRINGS_COOLPAD, '7230' ],
 			'7260':										[ STRINGS_COOLPAD, '7260' ],
 			'Coolpad 7260!':							[ STRINGS_COOLPAD, '7260' ],
 			'Coolpad 8013':								[ STRINGS_COOLPAD, '8013' ],
@@ -429,6 +450,7 @@ var UserAgents = (function(){
 			'8810':										[ STRINGS_COOLPAD, '8810' ],
 			'Coolpad 8811':								[ STRINGS_COOLPAD, '8811' ],
 			'Coolpad 9900':								[ STRINGS_COOLPAD, '9900' ],
+			'Coolpad 9960':								[ STRINGS_COOLPAD, '9960' ],
 			'ZiiO7':									[ 'Creative', 'ZiiO 7', TYPE_TABLET ],
 			'ZiiLABS ZiiO7':							[ 'Creative', 'ZiiO 7', TYPE_TABLET ],
 			'ZiiLABS ZiiO10 ':							[ 'Creative', 'ZiiO 10', TYPE_TABLET ],
@@ -449,7 +471,9 @@ var UserAgents = (function(){
 			'U9GTS A':									[ 'Cube', 'U9GT SA', TYPE_TABLET ],
 			'U10GT 2':									[ 'Cube', 'U10GT 2', TYPE_TABLET ],
 			'U10GT S':									[ 'Cube', 'U10GT S', TYPE_TABLET ],
+			'CUBE U15GT':								[ 'Cube', 'U15GT', TYPE_TABLET ],
 			'U30GT-H':									[ 'Cube', 'U30GT H', TYPE_TABLET ],
+			'U30GT-M':									[ 'Cube', 'U30GT M', TYPE_TABLET ],
 			'CUBE Q7PRO':								[ 'Cube', 'Q7 Pro', TYPE_TABLET ],
 			'CUBE Q7PRO J':								[ 'Cube', 'Q7 Pro', TYPE_TABLET ],
 			'Cydle M7!':								[ 'Cydle', 'M7 MultiPAD', TYPE_TABLET ],
@@ -507,14 +531,18 @@ var UserAgents = (function(){
 			'GSmart G1345':								[ 'Gigabyte', 'GSmart G1345' ],
 			'Gigabyte TB100':							[ 'Gigabyte', 'TB100', TYPE_TABLET ],
 			'GIO-GiONEE C500':							[ 'Gionee', 'C500' ],
+			'GIO-GiONEE C600':							[ 'Gionee', 'C600' ],
+			'GN100':									[ 'Gionee', 'GN100' ],		
 			'GN105':									[ 'Gionee', 'GN105' ],		
+			'GN109':									[ 'Gionee', 'GN109' ],
+			'GN180':									[ 'Gionee', 'GN180' ],
 			'GN200':									[ 'Gionee', 'GN200' ],		
 			'GN205':									[ 'Gionee', 'GN205' ],
-			'Google Ion':								[ 'Google', 'Ion' ],
-			'(HTC )?Nexus ?One!':						[ 'Google', 'Nexus One' ],
-			'(Google )?Nexus S!':						[ 'Google', 'Nexus S' ],
-			'Dooderbutt!':								[ 'Google', 'Nexus S' ],
-			'(Google )?Nexus 7!':						[ 'Google', 'Nexus 7', TYPE_TABLET ],
+			'GN305':									[ 'Gionee', 'GN305' ],
+			'GN360':									[ 'Gionee', 'GN360' ],
+			'GN700T':									[ 'Gionee', 'GN700T' ],
+			'GN858':									[ 'Gionee', 'GN858' ],
+			'Haier-HT-I617':							[ 'Haier', 'HT-I617' ],
 			'Haier HW-W910':							[ 'Haier', 'HW-W910' ],
 			'X720D':									[ 'Haipai', 'X720D' ],
 			'SN10T1':									[ 'HANNspree', 'HANNSpad SN10T1', TYPE_TABLET ],
@@ -525,8 +553,10 @@ var UserAgents = (function(){
 			'HS-9DTB4':									[ 'Hipstreet', '9" Flare tablet', TYPE_TABLET ],
 			'COSMO DUO':								[ 'Hiscreen', 'Cosmo DUO', TYPE_TABLET ],
 			'HS-U8':									[ 'Hisense', 'U8' ],
+			'HS-U950':									[ 'Hisense', 'U950' ],
 			'HS-T92':									[ 'Hisense', 'T92' ],
 			'HS-T96':									[ 'Hisense', 'T96' ],
+			'HS-T909':									[ 'Hisense', 'T909' ],
 			'HS-E860':									[ 'Hisense', 'E860' ],
 			'E860':										[ 'Hisense', 'E860' ],
 			'HS-E910':									[ 'Hisense', 'E910' ],
@@ -546,13 +576,14 @@ var UserAgents = (function(){
 			'HTC Bee':									[ STRINGS_HTC, 'Bee' ],
 			'HTC ChaCha!':								[ STRINGS_HTC, 'ChaCha' ],
 			'HTC A810e':								[ STRINGS_HTC, 'ChaCha' ],
-			'HTC A9188':								[ STRINGS_HTC, 'Cullinan' ],
+			'HTC A9188!':								[ STRINGS_HTC, 'Cullinan' ],
 			'HTC Desire C':								[ STRINGS_HTC, 'Desire C' ],
 			'HTC Desire ?HD!':							[ STRINGS_HTC, 'Desire HD' ],
 			'HTC A91(91|92)!':							[ STRINGS_HTC, 'Desire HD' ],
 			'HTC Desire ?S( |$)!':						[ STRINGS_HTC, 'Desire S' ],
 			'HTC S510(b|e)!':							[ STRINGS_HTC, 'Desire S' ],
 			'HTC Desire Saga':							[ STRINGS_HTC, 'Desire S' ],
+			'HTC Saga':									[ STRINGS_HTC, 'Desire S' ],
 			'HTC Desire V':								[ STRINGS_HTC, 'Desire V' ],
 			'HTC T328w':								[ STRINGS_HTC, 'Desire V' ],
 			'HTC Desire VC':							[ STRINGS_HTC, 'Desire VC' ],
@@ -567,14 +598,15 @@ var UserAgents = (function(){
 			'HTC A81(81|83)!':							[ STRINGS_HTC, 'Desire' ],
 			'HTC ?X06HT!':								[ STRINGS_HTC, 'Desire' ],
 			'HTC Dream':								[ STRINGS_HTC, 'Dream' ],
+			'HTC Droid Incredible':						[ STRINGS_HTC, 'Droid Incredible' ],
 			'HTC S710d':								[ STRINGS_HTC, 'Droid Incredible 2' ],
 			'HTC Incredible 2':							[ STRINGS_HTC, 'Droid Incredible 2' ],
 			'HTC EVO ?3D!':								[ STRINGS_HTC, 'EVO 3D' ],
 			'HTC X51(5a|5c|5d|5m)!':					[ STRINGS_HTC, 'EVO 3D' ],
 			'HTC EVO 4G\+!':							[ STRINGS_HTC, 'EVO 4G+' ],
 			'HTC X515e':								[ STRINGS_HTC, 'EVO 4G+' ],
-			'HTC EVO 4G':								[ STRINGS_HTC, 'EVO 4G' ],
-			'HTC ?(EVO )?Design ?4G!':					[ STRINGS_HTC, 'EVO Design 4G' ],		
+			'HTC EVO ?4G!':								[ STRINGS_HTC, 'EVO 4G' ],
+			'HTC ?(EVO ?)?Design ?4G!':					[ STRINGS_HTC, 'EVO Design 4G' ],		
 			'HTC C715c':								[ STRINGS_HTC, 'EVO Design 4G' ],
 			'HTC EVO Shift!':							[ STRINGS_HTC, 'EVO Shift' ],
 			'HTC Explorer!':							[ STRINGS_HTC, 'Explorer' ],
@@ -594,6 +626,7 @@ var UserAgents = (function(){
 			'HTC HERO200':								[ STRINGS_HTC, 'Hero 200' ],			/* Sprint */
 			'HTC Hero S':								[ STRINGS_HTC, 'Hero S' ],				/* US Cellular */
 			'HTC Hero!':								[ STRINGS_HTC, 'Hero' ],
+			'HTC H3000C':								[ STRINGS_HTC, 'Hero' ],
 			'HTC IMAGIO':								[ STRINGS_HTC, 'Imagio' ],
 			'HTC Incredible':							[ STRINGS_HTC, 'Incredible' ],
 			'HTC Incredible ?S!':						[ STRINGS_HTC, 'Incredible S' ],
@@ -615,6 +648,9 @@ var UserAgents = (function(){
 			'HTC One X':								[ STRINGS_HTC, 'One X' ],
 			'HTC Endeavour!':							[ STRINGS_HTC, 'One X' ],
 			'HTC S720e':								[ STRINGS_HTC, 'One X' ],
+			'HTC One X+':								[ STRINGS_HTC, 'One X+' ],
+			'HTC OneXplus':								[ STRINGS_HTC, 'One X+' ],
+			'HTC PM63100':								[ STRINGS_HTC, 'One X+' ],
 			'HTC One XL':								[ STRINGS_HTC, 'One XL' ],
 			'HTC S720t':								[ STRINGS_HTC, 'One XT' ],
 			'HTC Raider!':								[ STRINGS_HTC, 'Raider 4G' ],
@@ -649,7 +685,7 @@ var UserAgents = (function(){
 			'HTC Mecha':								[ STRINGS_HTC, 'ThunderBolt'],
 			'HTC Velocity!':							[ STRINGS_HTC, 'Velocity 4G'],
 			'HTC Wildfire ?S!':							[ STRINGS_HTC, 'Wildfire S' ],	
-			'HTC .*A510(b|c|e)!':						[ STRINGS_HTC, 'Wildfire S' ],
+			'HTC .*A510(a|b|c|e)!':						[ STRINGS_HTC, 'Wildfire S' ],
 			'HTC Wildfire!':							[ STRINGS_HTC, 'Wildfire' ],
 			'HTC .*A33(33|66|80)!':						[ STRINGS_HTC, 'Wildfire' ],
 			'HTC A6390':								[ STRINGS_HTC, 'A6390' ],
@@ -662,39 +698,44 @@ var UserAgents = (function(){
 			'HTC VLE#U':								[ STRINGS_HTC, 'One S' ],
 			'HTC VIE U':								[ STRINGS_HTC, 'One S' ],
 			'HTC EVA UL':								[ STRINGS_HTC, 'One V' ],
-			'HTC DLX U':								[ STRINGS_HTC, 'One X5' ],
-			'HTC6435LVW 4G':							[ STRINGS_HTC, 'One X5' ],
+			'HTC DLX U':								[ STRINGS_HTC, 'Droid DNA' ],
+			'HTC DLX WL':								[ STRINGS_HTC, 'Droid DNA' ],
+			'HTC6435LVW!':								[ STRINGS_HTC, 'Droid DNA' ],
+			'DLX':										[ STRINGS_HTC, 'Droid DNA' ],
 			'HTC ENR U':								[ STRINGS_HTC, 'One X' ],
 			'ENR U':									[ STRINGS_HTC, 'One X' ],
 			'EndeavorU':								[ STRINGS_HTC, 'One X' ],
+			'HTC EVARE UL':								[ STRINGS_HTC, 'One X+' ],
 			'Liberty':									[ STRINGS_HTC, 'Aria' ],
 			'Desire HD!':								[ STRINGS_HTC, 'Desire HD' ],
 			'Desire ?S!':								[ STRINGS_HTC, 'Desire S' ],
 			'Desire Z':									[ STRINGS_HTC, 'Desire Z' ],
 			'Desire!':									[ STRINGS_HTC, 'Desire' ],
 			'Dream':									[ STRINGS_HTC, 'Dream' ],
+			'GinDream/GinMagic':						[ STRINGS_HTC, 'Dream' ],
+			'SiRF Dream':								[ STRINGS_HTC, 'Dream' ],
 			'Droid Incredible':							[ STRINGS_HTC, 'Droid Incredible' ],
+			'Incredible':								[ STRINGS_HTC, 'Droid Incredible' ],	/* Verizon */
+			'Incredible 2':								[ STRINGS_HTC, 'Droid Incredible 2' ],	/* Verizon */
 			'EVO':										[ STRINGS_HTC, 'EVO' ],
 			'Evo HD2':									[ STRINGS_HTC, 'EVO HD' ],
 			'EVO ?3D!':									[ STRINGS_HTC, 'EVO 3D' ],
 			'EVO 4G':									[ STRINGS_HTC, 'EVO 4G' ],
 			'photon':									[ STRINGS_HTC, 'HD mini' ],
-			'GinDream/GinMagic':						[ STRINGS_HTC, 'Dream' ],
 			'HD2':										[ STRINGS_HTC, 'HD2' ],
+			'NexusHD2':									[ STRINGS_HTC, 'HD2' ],
+			'Nexus HD2':								[ STRINGS_HTC, 'HD2' ],
 			'HD7  Pro':									[ STRINGS_HTC, 'HD7 Pro' ],
 			'Hero':										[ STRINGS_HTC, 'Hero' ],
 			'HERO CDMA':								[ STRINGS_HTC, 'Hero' ],
 			'HERO200':									[ STRINGS_HTC, 'Hero 200' ],
-			'Incredible':								[ STRINGS_HTC, 'Droid Incredible' ],	/* Verizon */
-			'Incredible 2':								[ STRINGS_HTC, 'Droid Incredible 2' ],	/* Verizon */
 			'Incredible ?S!':							[ STRINGS_HTC, 'Incredible S' ],
 			'Inspire HD':								[ STRINGS_HTC, 'Inspire 4G' ],
 			'Inspire 4G':								[ STRINGS_HTC, 'Inspire 4G' ],
 			'Legend':									[ STRINGS_HTC, 'Legend' ],
-			'NexusHD2':									[ STRINGS_HTC, 'HD2' ],
-			'Nexus HD2':								[ STRINGS_HTC, 'HD2' ],
 			'Docomo HT-03A':							[ STRINGS_HTC, 'Magic' ],
-			'SiRF Dream':								[ STRINGS_HTC, 'Dream' ],
+			'One X':									[ STRINGS_HTC, 'One X' ],
+			'One V':									[ STRINGS_HTC, 'One V' ],
 			'MIUI.us Sensation 4G':						[ STRINGS_HTC, 'Sensation 4G' ],
 			'SensationXE!':								[ STRINGS_HTC, 'Sensation XE' ],
 			'SensationXL!':								[ STRINGS_HTC, 'Sensation XL' ],
@@ -756,7 +797,7 @@ var UserAgents = (function(){
 			'Huawei C8650!':							[ STRINGS_HUAWEI, 'C8650' ],
 			'Huawei C8800':								[ STRINGS_HUAWEI, 'IDEOS X5' ],
 			'Huawei C8810':								[ STRINGS_HUAWEI, 'Ascend G300' ],
-			'Huawei C8812':								[ STRINGS_HUAWEI, 'Ascend C8812' ],
+			'Huawei C8812!':							[ STRINGS_HUAWEI, 'Ascend C8812' ],
 			'Huawei C8825D':							[ STRINGS_HUAWEI, 'Ascend G330C' ],
 			'Huawei C8860E':							[ STRINGS_HUAWEI, 'Honor' ],
 			'Huawei G300':								[ STRINGS_HUAWEI, 'Ascend G300' ],
@@ -767,27 +808,39 @@ var UserAgents = (function(){
 			'Huawei M931':								[ STRINGS_HUAWEI, 'M931' ],
 			'Huawei S8520':								[ STRINGS_HUAWEI, 'S8520' ],
 			'Huawei S8600':								[ STRINGS_HUAWEI, 'S8600' ],
+			'Huawei T8100':								[ STRINGS_HUAWEI, 'T8100' ],
 			'Huawei T8300':								[ STRINGS_HUAWEI, 'T8300' ],
+			'Huawei ?T8500!':							[ STRINGS_HUAWEI, 'T8500' ],
 			'Huawei T8600':								[ STRINGS_HUAWEI, 'T8600' ],
+			'Huawei T8620':								[ STRINGS_HUAWEI, 'Ascend Y200T' ],
+			'Huawei T8828':								[ STRINGS_HUAWEI, 'Ascend G305T' ],
+			'Huawei T8830':								[ STRINGS_HUAWEI, 'Ascend G309T' ],
 			'Huawei T8950':								[ STRINGS_HUAWEI, 'Honor+' ],
+			'Huawei T9200':								[ STRINGS_HUAWEI, 'Ascend P1' ],
 			'Huawei U8220':								[ STRINGS_HUAWEI, 'U8220' ],
 			'Huawei U8500':								[ STRINGS_HUAWEI, 'IDEOS X2' ],
+			'Huawei ?U8520!':							[ STRINGS_HUAWEI, 'U8520 Duplex' ],
 			'Huawei ?U8650!':							[ STRINGS_HUAWEI, 'Sonic' ],
-			'Huawei U8815':								[ STRINGS_HUAWEI, 'Ascend G300' ],
-			'Huawei U8850':								[ STRINGS_HUAWEI, 'Vision' ],
 			'Huawei U8652':								[ STRINGS_HUAWEI, 'Sonic' ],
 			'Huawei U8661':								[ STRINGS_HUAWEI, 'Sonic+' ],
+			'Huawei U8666!':							[ STRINGS_HUAWEI, 'Ascend Y201' ],
 			'Huawei U8800!':							[ STRINGS_HUAWEI, 'IDEOS X5' ],
+			'Huawei U8815':								[ STRINGS_HUAWEI, 'Ascend G300' ],
 			'Huawei U8818':								[ STRINGS_HUAWEI, 'Ascend G300' ],
 			'Huawei U8825D':							[ STRINGS_HUAWEI, 'Ascend G330D' ],
+			'Huawei U8850':								[ STRINGS_HUAWEI, 'Vision' ],
+			'Huawei U8950!':							[ STRINGS_HUAWEI, 'Ascend G600' ],
 			'Huawei U9000':								[ STRINGS_HUAWEI, 'Ascend X' ],
-			'Huawei U9510E':							[ STRINGS_HUAWEI, 'Ascend D quad' ],
+			'Huawei U9510!':							[ STRINGS_HUAWEI, 'Ascend D quad' ],
+			'Huawei D2-0082':							[ STRINGS_HUAWEI, 'Ascend D2' ],
 			'Huawei IDEOS U8500':						[ STRINGS_HUAWEI, 'IDEOS X2' ],
 			'Huawei IDEOS U8650':						[ STRINGS_HUAWEI, 'Sonic' ],
 			'Huawei IDEOS X3':							[ STRINGS_HUAWEI, 'IDEOS X3' ],
 			'Huawei Ideos X5!':							[ STRINGS_HUAWEI, 'IDEOS X5' ],
 			'Huawei SONIC':								[ STRINGS_HUAWEI, 'Sonic' ],
 			'Huawei 8100-9':							[ STRINGS_HUAWEI, 'U8100' ],
+			'Ascend G300':								[ STRINGS_HUAWEI, 'Ascend G300' ],
+			'Huawei Y300!':								[ STRINGS_HUAWEI, 'Ascend Y300' ],
 			'FUSIONideos':								[ STRINGS_HUAWEI, 'IDEOS' ],
 			'Gnappo Ideos':								[ STRINGS_HUAWEI, 'IDEOS' ],
 			'Ideos':									[ STRINGS_HUAWEI, 'IDEOS' ],
@@ -818,6 +871,7 @@ var UserAgents = (function(){
 			'C8810':									[ STRINGS_HUAWEI, 'Ascend G300C' ],
 			'C8812':									[ STRINGS_HUAWEI, 'Ascend C8812' ],
 			'S8600':									[ STRINGS_HUAWEI, 'S8600' ],
+			'T8620':									[ STRINGS_HUAWEI, 'Ascend Y200T' ],
 			'U8100':									[ STRINGS_HUAWEI, 'U8100' ],
 			'U8110':									[ STRINGS_HUAWEI, 'U8110' ],
 			'U8120':									[ STRINGS_HUAWEI, 'U8120' ],
@@ -862,6 +916,8 @@ var UserAgents = (function(){
 			'AZ210A':									[ 'Intel', 'AZ210A' ],
 			'AZ210B':									[ 'Intel', 'AZ210B' ],
 			'AZ510':									[ 'Intel', 'AZ510' ],
+			'BT210':									[ 'Intel', 'BT210' ],
+			'BT510':									[ 'Intel', 'BT510' ],
 			'greenridge':								[ 'Intel', 'Green Ridge', TYPE_TABLET ],
 			'INQ Cloud Touch':							[ 'INQ', 'Cloud Touch' ],
 			'ILT-MX100':								[ 'iRiver', 'Tab', TYPE_TABLET ],
@@ -874,6 +930,7 @@ var UserAgents = (function(){
 			'A106':										[ 'koobee', 'A160' ],
 			'KPT A9':									[ 'KPT', 'A9' ],
 			'EV-S100':									[ 'Kttech', 'Take EV-S100' ],
+			'KM-E100':									[ 'Kttech', 'Take LTE KM-E100' ],
 			'KM-S120':									[ 'Kttech', 'Take 2 KM-S120' ],
 			'KM-S200':									[ 'Kttech', 'Take Janus KM-S200' ],
 			'KM-S220':									[ 'Kttech', 'Take Tachy KM-S220' ],
@@ -887,24 +944,33 @@ var UserAgents = (function(){
 			'M9300':									[ 'Kyocera', 'M9300' ],
 			'K-Touch E619':								[ 'K-Touch', 'E619' ],
 			'E800':										[ 'K-Touch', 'E800' ],
+			'K-TouchT580':								[ 'K-Touch', 'T580' ],
+			'K-Touch V9':								[ 'K-Touch', 'V9' ],
 			'W606':										[ 'K-Touch', 'W606' ],
 			'K-Touch W619':								[ 'K-Touch', 'W619' ],
+			'K-Touch W621':								[ 'K-Touch', 'W621' ],
 			'K-Touch W650':								[ 'K-Touch', 'W650' ],
+			'K-Touch W688':								[ 'K-Touch', 'W688' ],
 			'W700':										[ 'K-Touch', 'W700' ],
+			'W732':										[ 'K-Touch', 'W732' ],
 			'K-Touch W760':								[ 'K-Touch', 'W760' ],
 			'W800':										[ 'K-Touch', 'W800' ],
+			'K-Touch W806+':							[ 'K-Touch', 'W806' ],
 			'W806':										[ 'K-Touch', 'W806' ],
 			'W808':										[ 'K-Touch', 'W808' ],
 			'W810':										[ 'K-Touch', 'W810' ],
+			'W880':										[ 'K-Touch', 'W880' ],
 			'X900':										[ 'Lava', 'XOLO X900' ],
 			'ThinkPad( Tablet)?!':						[ STRINGS_LENOVO, 'ThinkPad Tablet', TYPE_TABLET ],
 			'(Ideapad )?K1!':							[ STRINGS_LENOVO, 'IdeaPad K1', TYPE_TABLET ],
 			'Ideapad S10-3T':							[ STRINGS_LENOVO, 'IdeaPad S10-3T', TYPE_TABLET ],
 			'S2005A-H':									[ STRINGS_LENOVO, 'S2005A' ],
+			'IdeaTab ?A2107(A-H)!':						[ STRINGS_LENOVO, 'IdeaTab A2107A', TYPE_TABLET ],
+			'IdeaTab ?A2109(A)!':						[ STRINGS_LENOVO, 'IdeaTab A2109A', TYPE_TABLET ],
+			'IdeaTab ?K2110(A-F)!':						[ STRINGS_LENOVO, 'IdeaTab K2110A', TYPE_TABLET ],
 			'IdeaTab ?S2007(A-D)!':						[ STRINGS_LENOVO, 'IdeaTab S2007A', TYPE_TABLET ],
 			'IdeaTab ?V2007(A|A-D-I)!':					[ STRINGS_LENOVO, 'IdeaTab V2007A', TYPE_TABLET ],
 			'IdeaTab ?V2010(A)!':						[ STRINGS_LENOVO, 'IdeaTab V2010A', TYPE_TABLET ],
-			'IdeaTab ?A2107(A-H)!':						[ STRINGS_LENOVO, 'IdeaTab V2107A', TYPE_TABLET ],
 			'A1 07':									[ STRINGS_LENOVO, 'LePad', TYPE_TABLET ],
 			'lepad 001b':								[ STRINGS_LENOVO, 'LePad', TYPE_TABLET ],
 			'lepad 001n':								[ STRINGS_LENOVO, 'LePad', TYPE_TABLET ],
@@ -922,8 +988,11 @@ var UserAgents = (function(){
 			'Lenovo A390e':								[ STRINGS_LENOVO, 'LePhone A390' ],
 			'Lenovo A500':								[ STRINGS_LENOVO, 'LePhone A500' ],
 			'Lenovo A520!':								[ STRINGS_LENOVO, 'LePhone A520' ],
+			'Lenovo A560e':								[ STRINGS_LENOVO, 'LePhone A560' ],
+			'Lenovo A660':								[ STRINGS_LENOVO, 'LePhone A660' ],
 			'Lenovo A668t':								[ STRINGS_LENOVO, 'LePhone A668' ],
 			'Lenovo A698t':								[ STRINGS_LENOVO, 'LePhone A698' ],
+			'Lenovo A710e':								[ STRINGS_LENOVO, 'LePhone A710' ],
 			'Lenovo A750':								[ STRINGS_LENOVO, 'LePhone A750' ],
 			'Lenovo A780':								[ STRINGS_LENOVO, 'LePhone A780' ],
 			'Lenovo A789':								[ STRINGS_LENOVO, 'LePhone A789' ],
@@ -933,6 +1002,7 @@ var UserAgents = (function(){
 			'Lenovo P700!':								[ STRINGS_LENOVO, 'LePhone P700' ],
 			'Lenovo S560':								[ STRINGS_LENOVO, 'S560' ],
 			'Lenovo S680':								[ STRINGS_LENOVO, 'S680' ],
+			'Lenovo S720':								[ STRINGS_LENOVO, 'S720' ],
 			'Lenovo S850e':								[ STRINGS_LENOVO, 'S850' ],
 			'Lenovo S880':								[ STRINGS_LENOVO, 'S880' ],
 			'Lenovo ?S899!':							[ STRINGS_LENOVO, 'S899' ],
@@ -953,6 +1023,8 @@ var UserAgents = (function(){
 			'LG-CX670':									[ STRINGS_LG, 'Optimus 3G' ],
 			'LG-E400!':									[ STRINGS_LG, 'Optimus L3' ],
 			'LG-E405!':									[ STRINGS_LG, 'Optimus L3 Dual' ],
+			'LG-E435!':									[ STRINGS_LG, 'E435' ],
+			'LG-E455!':									[ STRINGS_LG, 'E455' ],
 			'LG-E510!':									[ STRINGS_LG, 'Optimus Hub' ],
 			'LG-E6(10|12|17)!':							[ STRINGS_LG, 'Optimus L5' ],
 			'LG-E615!':									[ STRINGS_LG, 'Optimus L5 Dual' ],
@@ -960,10 +1032,13 @@ var UserAgents = (function(){
 			'LG-E730':									[ STRINGS_LG, 'Optimus Sol' ],
 			'LG-E960':									[ STRINGS_LG, 'Nexus 4' ],
 			'LG-E970':									[ STRINGS_LG, 'Shine' ],
+			'LG-E9(71|73)!':							[ STRINGS_LG, 'Optimus G' ],
 			'LG-F100!':									[ STRINGS_LG, 'Optimus Vu' ],
 			'LG-F120!':									[ STRINGS_LG, 'Optimus LTE Tag' ],
 			'LG-F160!':									[ STRINGS_LG, 'Optimus LTE II' ],
 			'LG-F180!':									[ STRINGS_LG, 'Optimus G' ],
+			'LG-F200!':									[ STRINGS_LG, 'Optimus Vu 2' ],
+			'LG-F260!':									[ STRINGS_LG, 'F260' ],
 			'LG-GT540!':								[ STRINGS_LG, 'Optimus' ],
 			'LG-GW620':									[ STRINGS_LG, 'GW620 Eve' ],
 			'LG-KH5200':								[ STRINGS_LG, 'Andro-1' ],
@@ -971,12 +1046,13 @@ var UserAgents = (function(){
 			'LG-KU5400':								[ STRINGS_LG, 'PRADA 3.0' ],
 			'LG-KU5900':								[ STRINGS_LG, 'Optimus Black' ],
 			'LG-L40G':									[ STRINGS_LG, 'L40G' ],
+			'LG-LG730':									[ STRINGS_LG, 'Venice' ],
 			'LG-LG855':									[ STRINGS_LG, 'Marquee' ],
 			'LG-LS670':									[ STRINGS_LG, 'Optimus S' ],
 			'LG-LS696':									[ STRINGS_LG, 'Elite' ],
 			'LG-LS840':									[ STRINGS_LG, 'Viper' ],
 			'LG-LS855':									[ STRINGS_LG, 'Marquee' ],
-			'LG-LS860':									[ STRINGS_LG, '"Cayenne"' ],
+			'LG-LS860':									[ STRINGS_LG, 'Mach' ],
 			'LG-LS970':									[ STRINGS_LG, 'Eclipse' ],
 			'LG-LU3000':								[ STRINGS_LG, 'Optimus Mach' ],
 			'LG-LU3100':								[ STRINGS_LG, 'Optimus Chic' ],
@@ -1013,7 +1089,7 @@ var UserAgents = (function(){
 			'LG-P920!':									[ STRINGS_LG, 'Optimus 3D' ],
 			'LG-P925!':									[ STRINGS_LG, 'Thrill' ],
 			'LG-P930':									[ STRINGS_LG, 'Nitro HD' ],
-			'LG-P936':									[ STRINGS_LG, 'Optimus LTE' ],
+			'LG-P9(35|36)!':							[ STRINGS_LG, 'Optimus LTE' ],
 			'LG-P940':									[ STRINGS_LG, 'PRADA 3.0' ],
 			'LG-P970!':									[ STRINGS_LG, 'Optimus Black' ],
 			'LG-P990!':									[ STRINGS_LG, 'Optimus 2X Speed' ],
@@ -1035,12 +1111,13 @@ var UserAgents = (function(){
 			'LG-VS700':									[ STRINGS_LG, 'Enlighten' ],
 			'LG-VS740':									[ STRINGS_LG, 'Ally' ],
 			'LG-VS840':									[ STRINGS_LG, 'Lucid' ],
+			'LG-VS870':									[ STRINGS_LG, 'VS870' ],
 			'LG-VS910':									[ STRINGS_LG, 'Revolution' ],
 			'lgp-970':									[ STRINGS_LG, 'Optimus Black' ],
 			'AS740':									[ STRINGS_LG, 'Axis' ],
 			'E900':										[ STRINGS_LG, 'Optimus 7' ],
 			'GT540':									[ STRINGS_LG, 'Optimus GT540' ],
-			'GW620':									[ STRINGS_LG, 'GW620' ],
+			'GW620':									[ STRINGS_LG, 'Eve' ],
 			'KU9500':									[ STRINGS_LG, 'Optimus Z' ],
 			'LGC660':									[ STRINGS_LG, 'Optimus Pro' ],
 			'LGL45C':									[ STRINGS_LG, 'Optimus Net' ],
@@ -1053,14 +1130,16 @@ var UserAgents = (function(){
 			'USCC-US760':								[ STRINGS_LG, 'Genesis' ],
 			'VM670':									[ STRINGS_LG, 'Optimus V' ],
 			'VS840 4G':									[ STRINGS_LG, 'Lucid' ],
+			'VS870 4G':									[ STRINGS_LG, 'VS870' ],
 			'VS900-4G':									[ STRINGS_LG, 'Enlighten' ],
 			'VS910 4G':									[ STRINGS_LG, 'Revolution 4G' ],
 			'VS920 4G':									[ STRINGS_LG, 'Spectrum' ],
-			'VS930 4G':									[ STRINGS_LG, 'VS930' ],
+			'VS930 4G':									[ STRINGS_LG, 'Spectrum 2' ],
 			'VS950 4G':									[ STRINGS_LG, 'Intuition' ],
 			'L-01D':									[ STRINGS_LG, 'Optimus LTE' ],
+			'L-01E':									[ STRINGS_LG, 'Optimus G' ],
 			'L-02D':									[ STRINGS_LG, 'PRADA phone' ],
-			'L-02E':									[ STRINGS_LG, 'Optimus G' ],
+			'L-02E':									[ STRINGS_LG, 'Optimus LIFE' ],
 			'L-04C':									[ STRINGS_LG, 'Optimus Chat' ],
 			'L-05D':									[ STRINGS_LG, 'Optimus it' ],
 			'L-06C':									[ STRINGS_LG, 'Optimus Pad', TYPE_TABLET ],
@@ -1092,6 +1171,7 @@ var UserAgents = (function(){
 			'LIFETAB S9512':							[ 'Medion', 'Lifetab S9512', TYPE_TABLET ],
 			'LIFETAB P9514':							[ 'Medion', 'Lifetab P9514', TYPE_TABLET ],
 			'MD LIFETAB P9516':							[ 'Medion', 'Lifetab P9516', TYPE_TABLET ],
+			'MEDION LIFE P4012':						[ 'Medion', 'Life P4012' ],
 			'MEDION LIFE P4310':						[ 'Medion', 'Life P4310' ],
 			'M8':										[ 'Meizu', 'M8' ],
 			'M9':										[ 'Meizu', 'M9' ],
@@ -1102,14 +1182,27 @@ var UserAgents = (function(){
 			'M031':										[ 'Meizu', 'MX M031' ],
 			'M032':										[ 'Meizu', 'MX M032' ],
 			'Slidepad':									[ 'Memup', 'Slidepad', TYPE_TABLET ],
+			'Micromax A44':								[ 'Micromax', 'A44 Punk' ],
 			'A45':										[ 'Micromax', 'A45 Punk' ],
 			'Micromax A50':								[ 'Micromax', 'A50 Ninja' ],
+			'Micromax A52':								[ 'Micromax', 'A52 Aisha' ],
+			'Micromax A56':								[ 'Micromax', 'A56 Ninja 2' ],
 			'Micromax A57':								[ 'Micromax', 'A57 Ninja 3' ],
 			'Micromax A60':								[ 'Micromax', 'Andro A60' ],
 			'Micromax A70':								[ 'Micromax', 'Andro A70' ],
+			'Micromax A73':								[ 'Micromax', 'A73 Buzz' ],
+			'Micromax A75':								[ 'Micromax', 'A75 Lite' ],
+			'Micromax A78':								[ 'Micromax', 'A78 Gossip' ],
+			'Micromax A80':								[ 'Micromax', 'A80 Infinity' ],
+			'Micromax A84':								[ 'Micromax', 'A84' ],
+			'Micromax A85':								[ 'Micromax', 'A85' ],
 			'Micromax A87':								[ 'Micromax', 'A87 Ninja 4' ],
-			'Micromax A90':								[ 'Micromax', 'A90 Superfone' ],
+			'Micromax A90':								[ 'Micromax', 'A90 Pixel' ],
+			'Micromax A100':							[ 'Micromax', 'A100 Canvas' ],
+			'Micromax A110':							[ 'Micromax', 'A110 Canvas 2' ],
+			'Micromax P275':							[ 'Micromax', 'Funbook Infinity P275', TYPE_TABLET ],
 			'P300(Funbook)':							[ 'Micromax', 'Funbook P300', TYPE_TABLET ],
+			'Micromax P500(Funbook)':					[ 'Micromax', 'Funbook Pro P500', TYPE_TABLET ],
 			'AT735':									[ 'Moinstone', 'AT735', TYPE_TABLET ],
 			'A853':										[ STRINGS_MOTOROLA, 'Milestone' ],
 			'A953':										[ STRINGS_MOTOROLA, 'Milestone 2' ],
@@ -1128,8 +1221,7 @@ var UserAgents = (function(){
 			'MB612':									[ STRINGS_MOTOROLA, 'XPRT' ],
 			'MB632':									[ STRINGS_MOTOROLA, 'PRO+' ],
 			'MB855':									[ STRINGS_MOTOROLA, 'PHOTON 4G' ],
-			'MB860':									[ STRINGS_MOTOROLA, 'ATRIX' ],
-			'MB861':									[ STRINGS_MOTOROLA, 'ATRIX' ],
+			'MB8(60|61)!':								[ STRINGS_MOTOROLA, 'ATRIX' ],
 			'MB865':									[ STRINGS_MOTOROLA, 'ATRIX 2' ],
 			'MB870':									[ STRINGS_MOTOROLA, 'Droid X2' ],
 			'MB886':									[ STRINGS_MOTOROLA, 'DINARA' ],
@@ -1167,17 +1259,17 @@ var UserAgents = (function(){
 			'XT311':									[ STRINGS_MOTOROLA, 'FIRE' ],
 			'XT316':									[ STRINGS_MOTOROLA, 'MOTO XT316' ],
 			'XT319':									[ STRINGS_MOTOROLA, 'MOTO XT319' ],
-			'XT320':									[ STRINGS_MOTOROLA, 'DEFY Mini' ],
-			'XT321':									[ STRINGS_MOTOROLA, 'DEFY Mini' ],
+			'XT3(20|21)!':								[ STRINGS_MOTOROLA, 'DEFY Mini' ],
+			'XT390':									[ STRINGS_MOTOROLA, 'MOTOSMART XT390' ],
 			'XT500':									[ STRINGS_MOTOROLA, 'MOTO XT500' ],
 			'xt-500':									[ STRINGS_MOTOROLA, 'MOTO XT500' ],
 			'XT502':									[ STRINGS_MOTOROLA, 'QUENCH XT5' ],
-			'XT530':									[ STRINGS_MOTOROLA, 'FIRE XT' ],
-			'XT531':									[ STRINGS_MOTOROLA, 'FIRE XT' ],
-			'XT532':									[ STRINGS_MOTOROLA, 'XT532' ],	
+			'XT5(30|31)!':								[ STRINGS_MOTOROLA, 'FIRE XT' ],
+			'XT532':									[ STRINGS_MOTOROLA, 'MOTO XT532' ],	
 			'XT535':									[ STRINGS_MOTOROLA, 'DEFY' ],	
-			'XT550':									[ STRINGS_MOTOROLA, 'XT550' ],	
-			'XT556':									[ STRINGS_MOTOROLA, 'XT556' ],	
+			'XT536':									[ STRINGS_MOTOROLA, 'DEFY Diana' ],	
+			'XT550':									[ STRINGS_MOTOROLA, 'MOTOSMART MIX' ],	
+			'XT5(56|57)!':								[ STRINGS_MOTOROLA, 'DEFY XT' ],	
 			'XT603':									[ STRINGS_MOTOROLA, 'ADMIRAL' ],
 			'XT605':									[ STRINGS_MOTOROLA, 'XT605' ],	
 			'XT610':									[ STRINGS_MOTOROLA, 'Droid Pro' ],
@@ -1196,22 +1288,20 @@ var UserAgents = (function(){
 			'XT800W':									[ STRINGS_MOTOROLA, 'MOTO Glam' ],
 			'XT800!':									[ STRINGS_MOTOROLA, 'MOTO XT800' ],
 			'XT806':									[ STRINGS_MOTOROLA, 'MOTO XT806' ],
-			'XT860':									[ STRINGS_MOTOROLA, 'Milestone 3' ],
+			'XT8(60|83)!':								[ STRINGS_MOTOROLA, 'Milestone 3' ],
 			'XT862':									[ STRINGS_MOTOROLA, 'Droid 3' ],
+			'XT881':									[ STRINGS_MOTOROLA, 'Electrify 2' ],
 			'XT882':									[ STRINGS_MOTOROLA, 'MOTO XT882' ],
-			'XT883':									[ STRINGS_MOTOROLA, 'Milestone 3' ],
-			'XT885':									[ STRINGS_MOTOROLA, 'RAZR V' ],
+			'XT8(85|86)!':								[ STRINGS_MOTOROLA, 'RAZR V' ],
 			'XT889':									[ STRINGS_MOTOROLA, 'XT889' ],
 			'XT890':									[ STRINGS_MOTOROLA, 'RAZR i' ],
-			'XT897':									[ STRINGS_MOTOROLA, 'Droid 4' ],
-			'XT901':									[ STRINGS_MOTOROLA, 'RAZR' ],
-			'XT907':									[ STRINGS_MOTOROLA, 'Droid RAZR Mini' ],
-			'XT910!':									[ STRINGS_MOTOROLA, 'RAZR' ],
-			'XT912':									[ STRINGS_MOTOROLA, 'Droid RAZR' ],
-			'XT923':									[ STRINGS_MOTOROLA, 'Droid RAZR HD' ],
-			'XT925':									[ STRINGS_MOTOROLA, 'Droid RAZR HD' ],
-			'XT926!':									[ STRINGS_MOTOROLA, 'Droid RAZR' ],
+			'XT8(94|97)!':								[ STRINGS_MOTOROLA, 'Droid 4' ],
+			'XT9(01|10)!':								[ STRINGS_MOTOROLA, 'RAZR' ],
+			'XT907':									[ STRINGS_MOTOROLA, 'Droid RAZR M' ],
+			'XT912!':									[ STRINGS_MOTOROLA, 'Droid RAZR' ],
+			'XT9(23|25|26)!':							[ STRINGS_MOTOROLA, 'Droid RAZR HD' ],
 			'XT928':									[ STRINGS_MOTOROLA, 'XT928' ],
+			'201M':										[ STRINGS_MOTOROLA, 'Droid RAZR M' ],
 			'Atrix 2':									[ STRINGS_MOTOROLA, 'ATRIX 2' ],
 			'Atrix 4G':									[ STRINGS_MOTOROLA, 'ATRIX 4G' ],
 			'Atrix 4G ME860':							[ STRINGS_MOTOROLA, 'ATRIX 4G' ],
@@ -1300,18 +1390,24 @@ var UserAgents = (function(){
 			'X903':										[ 'Oppo', 'Find Me X903' ],
 			'X905':										[ 'Oppo', 'Find 3 X905' ],
 			'OPPOX905':									[ 'Oppo', 'Find 3 X905' ],
+			'X907':										[ 'Oppo', 'Finder X907' ],
 			'OPPOX907':									[ 'Oppo', 'Finder X907' ],
 			'X9015':									[ 'Oppo', 'Find X9015' ],
+			'OPPOX9015':								[ 'Oppo', 'Find X9015' ],
 			'OPPOX9017':								[ 'Oppo', 'Finder X9017' ],
+			'R801':										[ 'Oppo', 'Real R801' ],
 			'OPPOR801':									[ 'Oppo', 'Real R801' ],
 			'OPPOR805':									[ 'Oppo', 'Real R805' ],
 			'OPPOR807':									[ 'Oppo', 'Real R807' ],
+			'OPPOR817':									[ 'Oppo', 'Real R817' ],
 			'OPPOT29':									[ 'Oppo', 'T29' ],
 			'OPPOT703':									[ 'Oppo', 'T703' ],
+			'OPPOU701':									[ 'Oppo', 'Ulike U701' ],
 			'OPPOU7011':								[ 'Oppo', 'Find Gemini U7011' ],
 			'P-01D':									[ 'Panasonic', 'P-01D' ],
 			'P-02D':									[ 'Panasonic', 'Lumix Phone' ],
 			'P-04D':									[ 'Panasonic', 'Eluga' ],
+			'P-06D':									[ 'Panasonic', 'Eluga V' ],
 			'P-07C':									[ 'Panasonic', 'P-07C' ],
 			'dL1':										[ 'Panasonic', 'Eluga dL1' ],
 			'101P':										[ 'Panasonic', 'Lumix Phone' ],
@@ -1323,24 +1419,26 @@ var UserAgents = (function(){
 			'pandigitalopc1':							[ 'Pandigital', 'OPC1', TYPE_TABLET ],
 			'pandigitalopp1':							[ 'Pandigital', 'OPP1', TYPE_TABLET ],
 			'pandigitalp1hr':							[ 'Pandigital', 'p1hr', TYPE_TABLET ],
-			'IM-A600S':									[ STRINGS_PANTECH, 'SIRIUS α' ],
-			'IM-A630K':									[ STRINGS_PANTECH, 'SKY Izar' ],
-			'IM-A690!':									[ STRINGS_PANTECH, 'SKY' ],
-			'IM-A7(10|20)!':							[ STRINGS_PANTECH, 'SKY Vega Xpress' ],
-			'IM-A725L':									[ STRINGS_PANTECH, 'SKY Vega X+' ],
-			'IM-A730S':									[ STRINGS_PANTECH, 'SKY Vega S' ],
-			'IM-A750K':									[ STRINGS_PANTECH, 'SKY Mirach A' ],
-			'IM-A7(60|70|80)!':							[ STRINGS_PANTECH, 'SKY Vega Racer' ],
-			'IM-A800S':									[ STRINGS_PANTECH, 'SKY Vega LTE' ],
-			'IM-A810!':									[ STRINGS_PANTECH, 'SKY Vega LTE M' ],
-			'IM-A820L':									[ STRINGS_PANTECH, 'SKY Vega LTE EX' ],
-			'IM-A830!':									[ STRINGS_PANTECH, 'SKY Vega Racer 2' ],
-			'IM-A840S':									[ STRINGS_PANTECH, 'SKY Vega S5' ],
-			'IM-A850K':									[ STRINGS_PANTECH, 'IM-A850K' ],	
-			'IM-T100K':									[ STRINGS_PANTECH, 'SKY Vega No. 5', TYPE_TABLET ],
+			'IM-A600!':									[ STRINGS_PANTECH, 'SIRIUS α' ],
+			'IM-A630!':									[ STRINGS_PANTECH, 'Izar' ],
+			'IM-A650!':									[ STRINGS_PANTECH, 'Vega' ],
+			'IM-A690!':									[ STRINGS_PANTECH, 'Mirach' ],
+			'IM-A7(10|20)!':							[ STRINGS_PANTECH, 'VegaXpress' ],
+			'IM-A725!':									[ STRINGS_PANTECH, 'Vega X+' ],
+			'IM-A730!':									[ STRINGS_PANTECH, 'Vega S' ],
+			'IM-A7(40|50)!':							[ STRINGS_PANTECH, 'Mirach A' ],
+			'IM-A7(60|70|75|80)!':						[ STRINGS_PANTECH, 'Vega Racer' ],
+			'IM-A800!':									[ STRINGS_PANTECH, 'Vega LTE' ],
+			'IM-A810!':									[ STRINGS_PANTECH, 'Vega LTE M' ],
+			'IM-A820!':									[ STRINGS_PANTECH, 'Vega LTE EX' ],
+			'IM-A830!':									[ STRINGS_PANTECH, 'Vega Racer 2' ],
+			'IM-A840!':									[ STRINGS_PANTECH, 'Vega S5' ],
+			'IM-A850!':									[ STRINGS_PANTECH, 'Vega R3' ],
+			'IM-T100K':									[ STRINGS_PANTECH, 'Vega N˚ 5', TYPE_TABLET ],
 			'IS06':										[ STRINGS_PANTECH, 'SIRIUS α' ],
 			'ADR8995!':									[ STRINGS_PANTECH, 'Breakout' ],
-			'ADR910L 4G':								[ STRINGS_PANTECH, 'ADR910L' ],
+			'ADR910L 4G':								[ STRINGS_PANTECH, 'Marauder' ],
+			'ADR930L 4G':								[ STRINGS_PANTECH, 'ADR930L' ],
 			'PantechP4100':								[ STRINGS_PANTECH, 'Element', TYPE_TABLET ],
 			'PantechP8000':								[ STRINGS_PANTECH, 'Crossover' ],
 			'PantechP8010':								[ STRINGS_PANTECH, 'Flex' ],
@@ -1348,8 +1446,8 @@ var UserAgents = (function(){
 			'PantechP9070':								[ STRINGS_PANTECH, 'Burst' ],
 			'PantechP9090':								[ STRINGS_PANTECH, 'Magnus' ],
 			'SKY IM-A600S':								[ STRINGS_PANTECH, 'SIRIUS α' ],
-			'SKY IM-A630K':								[ STRINGS_PANTECH, 'SKY Izar' ],
-			'SKY IM-A650S':								[ STRINGS_PANTECH, 'SKY Vega' ],
+			'SKY IM-A630K':								[ STRINGS_PANTECH, 'Izar' ],
+			'SKY IM-A650S':								[ STRINGS_PANTECH, 'Vega' ],
 			'IS11PT':									[ STRINGS_PANTECH, 'Mirach IS11PT' ],
 			'PAT712W':									[ 'Perfeo', 'PAT712W', TYPE_TABLET ],
 			'X7G':										[ 'Pearl', 'Touchlet X7G', TYPE_TABLET ],
@@ -1359,27 +1457,31 @@ var UserAgents = (function(){
 			'Philips W626':								[ 'Philips', 'W626' ],
 			'Philips W632':								[ 'Philips', 'W632' ],
 			'MOMO':										[ 'Ployer', 'MOMO', TYPE_TABLET ],
+			'MOMO7':									[ 'Ployer', 'MOMO7', TYPE_TABLET ],
 			'MOMO8':									[ 'Ployer', 'MOMO8', TYPE_TABLET ],
+			'MOMO9':									[ 'Ployer', 'MOMO9', TYPE_TABLET ],
 			'MOMO15':									[ 'Ployer', 'MOMO15', TYPE_TABLET ],
 			'PocketBook A7':							[ 'PocketBook', 'A7', TYPE_TABLET ],
 			'PocketBook A10':							[ 'PocketBook', 'A10', TYPE_TABLET ],
 			'Mobii 7':									[ 'Point Of View', 'Mobii 7', TYPE_TABLET ],
+			'PMID4311':									[ 'Polaroid', 'PMID 4311', TYPE_TABLET ],
 			'PMP3384BRU':								[ 'Prestigio', 'Multipad 3384', TYPE_TABLET ],
 			'TB07FTA':									[ 'Positivo', 'TB07FTA', TYPE_TABLET ],
 			'QW TB-1207':								[ 'Qware', 'Pro3', TYPE_TABLET ],
 			'W6HD ICS':									[ 'Ramos', 'W6HD', TYPE_TABLET ],
 			'W10':										[ 'Ramos', 'W10', TYPE_TABLET ],
 			'W10 V2.0':									[ 'Ramos', 'W10 v2.0', TYPE_TABLET ],
+			'W22PRO':									[ 'Ramos', 'W22 Pro', TYPE_TABLET ],
 			'T11AD!':									[ 'Ramos', 'T11AD', TYPE_TABLET ],
 			'Rikomagic MK802':							[ 'Rikomagic', 'MK802', TYPE_TELEVISION ],
 			'PlayBook':									[ 'RIM', 'BlackBerry PlayBook', TYPE_TABLET ],
 			'RBK-490':									[ 'Ritmix', 'RBK-490', TYPE_TABLET ],
 			'A8HD':										[ 'Saayi', 'Dropad A8HD', TYPE_TABLET ],
-			'Galaxy Nexus':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
-			'GT-B5330!':								[ STRINGS_SAMSUNG, 'GT-B5330' ],
+			'GT-B5330!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Chat' ],
 			'GT-B5510!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y Pro' ],
 			'GT-B5512!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y Pro Duos' ],
 			'GT-B7510!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Pro' ],
+			'GT-B9062':									[ STRINGS_SAMSUNG, 'GT-B9062' ],
 			'GT-I55(00|03|08)!':						[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' 5' ],
 			'GT-I5510!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' 551' ],
 			'GT-I5700!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Spica' ],
@@ -1397,8 +1499,8 @@ var UserAgents = (function(){
 			'GT-I9001!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Plus' ],
 			'GT-I9003!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' SL' ],
 			'GT-I9010!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Giorgio Armani' ],
-			'GT-I9018!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' GT-I9018' ],
-			'GT-I9050!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' GT-I9050' ],
+			'GT-I9018!':								[ STRINGS_SAMSUNG, 'GT-I9018' ],
+			'GT-I9050!':								[ STRINGS_SAMSUNG, 'GT-I9050' ],
 			'GT-I9070!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Advance' ],
 			'GT-I91(00|08)!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
 			'GT-I9103!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' R' ],
@@ -1406,9 +1508,9 @@ var UserAgents = (function(){
 			'GT-I92(20|28)!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
 			'GT-I9250!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
 			'GT-I93(00|03|05|08)!':						[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
-			'GT-I9500!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' GT-I9500' ],
-			'GT-I9800!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' GT-I9800' ],
-			'GT-N7000!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
+			'GT-I9500!':								[ STRINGS_SAMSUNG, 'GT-I9500' ],
+			'GT-I9800!':								[ STRINGS_SAMSUNG, 'GT-I9800' ],
+			'GT-N70(00|05)!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
 			'GT-N71(00|05)!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note II' ],
 			'GT-N80(00|05|10|13)!':						[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note 10.1' ],
 			'GT-P10(00|10)!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', TYPE_TABLET ],
@@ -1432,6 +1534,8 @@ var UserAgents = (function(){
 			'GT-S5690!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Xcover' ],
 			'GT-S58(20|30|38|39)!':						[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace' ],
 			'GT-S6102!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y Duos' ],
+			'GT-S6352':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace Duos' ],
+			'GT-S6358':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace' ],
 			'GT-S6500!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Mini 2' ],
 			'GT-S6702!':								[ STRINGS_SAMSUNG, 'GT-S6702' ],
 			'GT-S6802!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace Duos' ],
@@ -1443,7 +1547,7 @@ var UserAgents = (function(){
 			'SCH-i569':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Gio' ],
 			'SCH-i579':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace' ],
 			'SCH-i589':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace Duos' ],
-			'SCH-i705 4G':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 2 (7.0)', TYPE_TABLET ],
+			'SCH-i705!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 2 (7.0)', TYPE_TABLET ],
 			'SCH-i809':									[ STRINGS_SAMSUNG, 'SCH-i809' ],
 			'SCH-i889':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
 			'SCH-i909':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
@@ -1452,6 +1556,7 @@ var UserAgents = (function(){
 			'SCH-I100':									[ STRINGS_SAMSUNG, 'Gem' ],
 			'SCH-I110':									[ STRINGS_SAMSUNG, 'Illusion' ],
 			'SCH-I200':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Stellar' ],
+			'SCH-I339':									[ STRINGS_SAMSUNG, 'SCH-I339' ],
 			'SCH-I400':									[ STRINGS_SAMSUNG, 'Continuum' ],
 			'SCH-I405( 4G)?$!':							[ STRINGS_SAMSUNG, 'Stratosphere' ],
 			'SCH-I405U':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Metrix' ],
@@ -1470,6 +1575,7 @@ var UserAgents = (function(){
 			'SCH-I915':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 2 (10.1)', TYPE_TABLET ],
 			'SCH-I939':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
 			'SCH-M828!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Precedent' ],
+			'SCH-N719':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note II' ],
 			'SCH-R530!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
 			'SCH-R680':									[ STRINGS_SAMSUNG, 'Repp' ],
 			'SCH-R720':									[ STRINGS_SAMSUNG, 'Admire' ],
@@ -1484,11 +1590,12 @@ var UserAgents = (function(){
 			'SCH-R940':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Lightray' ],
 			'SCH-S720C':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Proclaim' ],
 			'SCH-S735C':								[ STRINGS_SAMSUNG, 'SCH-S735' ],
+			'SCH-S950C':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Showcase' ],
 			'SCH-W899':									[ STRINGS_SAMSUNG, 'SCH-W899' ],
 			'SCH-W999':									[ STRINGS_SAMSUNG, 'SCH-W999' ],
 			'SGH-E258':									[ STRINGS_SAMSUNG, 'SGH-E258' ],
-			'SGH-I317M':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note II' ],
-			'SGH-I547':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Rugby Pro' ],
+			'SGH-I317!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note II' ],
+			'SGH-I547!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Rugby Pro' ],
 			'SGH-I717!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
 			'SGH-I727':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II Skyrocket' ],
 			'SGH-I727R':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
@@ -1507,6 +1614,7 @@ var UserAgents = (function(){
 			'SGH-T499[VY]!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Mini' ],
 			'SGH-T589!':								[ STRINGS_SAMSUNG, 'Gravity Smart' ],
 			'SGH-T679!':								[ STRINGS_SAMSUNG, 'Exhibit II 4G' ],
+			'SGH-T699':									[ STRINGS_SAMSUNG, 'S Blaze Q' ],
 			'SGH-T759':									[ STRINGS_SAMSUNG, 'Exhibit 4G' ],
 			'SGH-T769':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Blaze 4G' ],
 			'SGH-T839':									[ STRINGS_SAMSUNG, 'T-Mobile Sidekick' ],
@@ -1514,6 +1622,7 @@ var UserAgents = (function(){
 			'SGH-T859':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1', TYPE_TABLET ],
 			'SGH-T869':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.0 Plus', TYPE_TABLET ],
 			'SGH-T879':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
+			'SGH-T889':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note II' ],
 			'SGH-T959':									[ STRINGS_SAMSUNG, 'Vibrant' ],
 			'SGH-T959D':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Fascinate 3G+' ],
 			'SGH-T959P':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Fascinate 4G' ],
@@ -1551,12 +1660,14 @@ var UserAgents = (function(){
 			'SPH-D710!':								[ STRINGS_SAMSUNG, 'Epic 4G Touch' ],
 			'SPH-L700':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
 			'SPH-L710':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
+			'SPH-L900':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note II' ],
 			'SPH-M820!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Prevail' ],
 			'SPH-M580':									[ STRINGS_SAMSUNG, 'Replenish' ],
 			'SPH-M900':									[ STRINGS_SAMSUNG, 'Moment' ],
 			'SPH-M910':									[ STRINGS_SAMSUNG, 'Intercept' ],
 			'SPH-M920':									[ STRINGS_SAMSUNG, 'Transform' ],
 			'SPH-M930!':								[ STRINGS_SAMSUNG, 'Transform Ultra' ],
+			'SPH-M950':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Reverb' ],
 			'SPH-P100':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', TYPE_TABLET ],
 			'YP-GB1':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Player', 'media' ],
 			'YP-GB70':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Player 70', 'media' ],
@@ -1579,7 +1690,6 @@ var UserAgents = (function(){
 			'Galaxy X':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' X' ],
 			'Galaxy Spica':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Spica' ],
 			'GALAXY Tab':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', TYPE_TABLET ],
-			'GALAXY NEXUS':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
 			'Vibrantmtd':								[ STRINGS_SAMSUNG, 'Vibrant' ],
 			'SC-01C':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', TYPE_TABLET ],
 			'SC-01D':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1 LTE', TYPE_TABLET ],
@@ -1641,6 +1751,7 @@ var UserAgents = (function(){
 			'SmartQT19':								[ 'SmartQ', 'T19', TYPE_TABLET ],
 			'SmartQT20':								[ 'SmartQ', 'T20', TYPE_TABLET ],
 			'OMS1 6':									[ STRINGS_SONY_ERICSSON, 'A8i' ],
+			'C1504':									[ STRINGS_SONY, 'C1504' ],
 			'C65(02|03|06)!':							[ STRINGS_SONY, STRINGS_XPERIA + ' "Odin"' ],
 			'E10(a|i|iv)!':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10 Mini' ],
 			'E15(a|i|iv|i-o)?$!':						[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X8' ],
@@ -1653,7 +1764,8 @@ var UserAgents = (function(){
 			'LT26ii!':									[ STRINGS_SONY, STRINGS_XPERIA + ' SL' ],
 			'LT26w!':									[ STRINGS_SONY, STRINGS_XPERIA + ' Acro S' ],
 			'LT28(at|h|i)!':							[ STRINGS_SONY, STRINGS_XPERIA + ' Ion' ],
-			'LT29i!':									[ STRINGS_SONY, STRINGS_XPERIA + ' GX' ],
+			'LT29i!':									[ STRINGS_SONY, STRINGS_XPERIA + ' TX' ],
+			'LT30(at)!':								[ STRINGS_SONY, STRINGS_XPERIA + ' TL' ],
 			'LT30(a|p)!':								[ STRINGS_SONY, STRINGS_XPERIA + ' T' ],
 			'MK16(a|i)!':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Pro' ],
 			'MT11(a|i|iv|i-o)!':						[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo V' ],
@@ -1685,6 +1797,7 @@ var UserAgents = (function(){
 			'SO-01B':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10' ],
 			'SO-01C':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc' ],
 			'SO-01D':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Play' ],
+			'SO-01E':									[ STRINGS_SONY, STRINGS_XPERIA + ' AX' ],
 			'SO-02C':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Acro' ],
 			'SO-02D':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' NX' ],
 			'SO-03C':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Ray' ],
@@ -1703,31 +1816,39 @@ var UserAgents = (function(){
 			'Xperia Neo V':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo V' ],
 			'Xperia Play':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Play' ],
 			'Xperia Pro':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Pro' ],
+			'Xperia S':									[ STRINGS_SONY, STRINGS_XPERIA + ' S' ],
 			'Xperia Live with Walkman':					[ STRINGS_SONY_ERICSSON, 'Live with Walkman' ],
 			'Hayabusa':									[ STRINGS_SONY, STRINGS_XPERIA + ' Ion' ],
 			'Nozomi':									[ STRINGS_SONY, STRINGS_XPERIA + ' S' ],
 			'Tablet P':									[ STRINGS_SONY, 'Tablet P', TYPE_TABLET ],
 			'Tablet S':									[ STRINGS_SONY, 'Tablet S', TYPE_TABLET ],
+			'SGPT12':									[ STRINGS_SONY, 'Tablet S', TYPE_TABLET ],
 			'NWZ?-Z1000Series!':						[ STRINGS_SONY, 'Walkman Z', 'media' ],
 			'Spice Mi280':								[ 'Spice', 'Mi-280' ],
 			'Spice Mi300':								[ 'Spice', 'Mi-300' ],
 			'Spice Mi-310':								[ 'Spice', 'Mi-310' ],
 			'Spice Mi-355':								[ 'Spice', 'Mi-355' ],
 			'Spice Mi-425':								[ 'Spice', 'Mi-425' ],
+			'Spice Mi-500':								[ 'Spice', 'Mi-500' ],
 			'SPICE Mi-720':								[ 'Spice', 'Mi-720' ],
 			'A7272+':									[ 'Star', 'A7272+' ],
 			'e1109 v73 gq1002 ctp':						[ 'Star', 'X18i' ],
 			'TS1004T':									[ 'Surf 3Q', 'TS1004T', TYPE_TABLET ],
 			'SYTABEX7-2':								[ 'Sylvania', 'SYTABEX7', TYPE_TABLET ],
 			'KM-S200':									[ 'TAKE', 'Janus KM-S200' ],
-			'TCL A860':									[ 'TCL' , 'A860' ],
-			'TCL A906':									[ 'TCL' , 'A906' ],
-			'TCL A909':									[ 'TCL' , 'A909' ],
-			'TCL A919':									[ 'TCL' , 'A919' ],
-			'TCL A990':									[ 'TCL' , 'A990' ],
-			'TCL A996':									[ 'TCL' , 'A996' ],
-			'TCL A998':									[ 'TCL' , 'A998' ],
-			'TCL GENESEE E708':							[ 'TCL' , 'Genesee E708' ],
+			'TCL A860':									[ 'TCL', 'A860' ],
+			'TCL A906':									[ 'TCL', 'A906' ],
+			'TCL A909':									[ 'TCL', 'A909' ],
+			'TCL A919':									[ 'TCL', 'A919' ],
+			'TCL A968':									[ 'TCL', 'A968' ],
+			'TCL A990':									[ 'TCL', 'A990' ],
+			'TCL A996':									[ 'TCL', 'A996' ],
+			'TCL A998':									[ 'TCL', 'A998' ],
+			'TCL C990+':								[ 'TCL', 'C990+' ],
+			'TCL GENESEE E708':							[ 'TCL', 'Genesee E708' ],
+			'TCL S500':									[ 'TCL', 'S500' ],
+			'(TCL )?S600!':								[ 'TCL', 'S600' ],
+			'TCL S900':									[ 'TCL', 'S900' ],
 			'A10t(5DM3)':								[ 'Teclast', 'A10T', TYPE_TABLET ],
 			'P72':										[ 'Teclast', 'P72', TYPE_TABLET ],
 			'P76TI':									[ 'Teclast', 'P76Ti', TYPE_TABLET ],
@@ -1791,6 +1912,7 @@ var UserAgents = (function(){
 			'N80':										[ 'Window', 'N80', TYPE_TABLET ],
 			'N90':										[ 'Window', 'N90', TYPE_TABLET ],
 			'N90 DUAL CORE2!':							[ 'Window', 'N90 Dual Core', TYPE_TABLET ],
+			'N101 DUAL CORE2!':							[ 'Window', 'N101 Dual Core', TYPE_TABLET ],
 			'N612':										[ 'Wishway', 'N612' ],
 			'AT-AS43D':									[ 'Wolfgang', 'AT-AS43D' ],
 			'M12':										[ 'Wopad', 'M12', TYPE_TABLET ],
@@ -1820,66 +1942,76 @@ var UserAgents = (function(){
 			'V9C':										[ STRINGS_ZTE, 'Light Tab 3', TYPE_TABLET ],
 			'V55':										[ STRINGS_ZTE, 'Optik', TYPE_TABLET ],
 			'Acqua':									[ STRINGS_ZTE, 'Acqua' ],
-			'Blade(-V880|-opda)?$!':					[ STRINGS_ZTE, 'Blade' ],
-			'ZTE (U )?V880!':							[ STRINGS_ZTE, 'Blade' ],
 			'ZTE Blade':								[ STRINGS_ZTE, 'Blade' ],
-			'ZTE U(V)880+':								[ STRINGS_ZTE, 'Blade' ],
-			'V880':										[ STRINGS_ZTE, 'Blade' ],
 			'a5':										[ STRINGS_ZTE, 'Blade' ],
-			'Blade2':									[ STRINGS_ZTE, 'Blade 2' ],
-			'Blade S':									[ STRINGS_ZTE, 'Blade S' ],
-			'X500':										[ STRINGS_ZTE, 'Score' ],
-			'ZTE X500':									[ STRINGS_ZTE, 'Score' ],
+			'Blade S':									[ STRINGS_ZTE, 'Blade S' ],			
 			'Skate':									[ STRINGS_ZTE, 'Skate' ],
 			'ZTE Skate':								[ STRINGS_ZTE, 'Skate' ],
-			'ZTE (U )?V960!':							[ STRINGS_ZTE, 'Skate' ],
-			'ZTE Racer':								[ STRINGS_ZTE, 'Racer' ],
-			'MTC 916':									[ STRINGS_ZTE, 'Racer' ],
-			'Racer':									[ STRINGS_ZTE, 'Racer' ],
-			'RacerII':									[ STRINGS_ZTE, 'Racer 2' ],
-			'ZTE Roamer':								[ STRINGS_ZTE, 'Roamer' ],
-			'N860':										[ STRINGS_ZTE, 'Warp' ],
-			'N880':										[ STRINGS_ZTE, 'Blade' ],
-			'ZTE T U802':								[ STRINGS_ZTE, 'T-U802' ],
-			'ZTE T U806':								[ STRINGS_ZTE, 'T-U806' ],
-			'ZTE T U812':								[ STRINGS_ZTE, 'T-U812' ],
-			'ZTE T U830':								[ STRINGS_ZTE, 'T-U830' ],
-			'ZTE T ?U880!':								[ STRINGS_ZTE, 'T-U880' ],
-			'ZTE T ?U900!':								[ STRINGS_ZTE, 'T-U900' ],	
-			'ZTE T ?U960!':								[ STRINGS_ZTE, 'T-U960' ],
-			'ZTE U N720':								[ STRINGS_ZTE, 'U-N720' ],
-			'ZTE U V856':								[ STRINGS_ZTE, 'U-V856' ],
-			'ZTE U V857':								[ STRINGS_ZTE, 'U-V857' ],
-			'ZTE U V881':								[ STRINGS_ZTE, 'U-V881' ],
-			'ZTE U X850':								[ STRINGS_ZTE, 'U-X850' ],
-			'ZTE U? X876!':								[ STRINGS_ZTE, 'U-X876' ],
-			'ZTE C R750':								[ STRINGS_ZTE, 'C-R750' ],
-			'ZTE C N600!':								[ STRINGS_ZTE, 'C-N600' ],
-			'ZTE C N606':								[ STRINGS_ZTE, 'C-N606' ],
-			'ZTE C N700':								[ STRINGS_ZTE, 'C-N700' ],
-			'ZTE C N760':								[ STRINGS_ZTE, 'C-N760' ],
-			'ZTE C N880!':								[ STRINGS_ZTE, 'C-N880' ],
-			'ZTE C X500':								[ STRINGS_ZTE, 'C-X500' ],
-			'ZTE C X920':								[ STRINGS_ZTE, 'C-X920' ],
-			'ZXY-ZTE-C X920':							[ STRINGS_ZTE, 'C-X920' ],
-			'ZTE GV821':								[ STRINGS_ZTE, 'G-V821' ],
+			'X500':										[ STRINGS_ZTE, 'X500 Score' ],
+			'ZTE X500':									[ STRINGS_ZTE, 'X500 Score' ],
+			'ZTE C X500':								[ STRINGS_ZTE, 'X500 Score' ],
+			'ZTE C N600!':								[ STRINGS_ZTE, 'N600' ],
+			'ZTE C N606':								[ STRINGS_ZTE, 'N606' ],
+			'ZTE C N700':								[ STRINGS_ZTE, 'N700' ],
+			'ZTE U N720':								[ STRINGS_ZTE, 'N720' ],
+			'ZTE C R750':								[ STRINGS_ZTE, 'R750' ],
+			'ZTE C N760':								[ STRINGS_ZTE, 'N760' ],
+			'ZTE V768':									[ STRINGS_ZTE, 'V768 Concord' ],
+			'ZTE N788':									[ STRINGS_ZTE, 'N788' ],
+			'ZTE V788!':								[ STRINGS_ZTE, 'V788 Kis' ],
+			'ZTE U788!':								[ STRINGS_ZTE, 'U788 Kis' ],
+			'ZTE U795':									[ STRINGS_ZTE, 'U795' ],
+			'ZTE T U802':								[ STRINGS_ZTE, 'U802' ],
+			'RacerII':									[ STRINGS_ZTE, 'U806 Racer II' ],
+			'ZTE T U806':								[ STRINGS_ZTE, 'U806 Racer II' ],
+			'E810':										[ STRINGS_ZTE, 'E810' ],
+			'ZTE T U812':								[ STRINGS_ZTE, 'U812' ],
+			'ZTE GV821':								[ STRINGS_ZTE, 'V821' ],
+			'ZTE T U830':								[ STRINGS_ZTE, 'U830' ],		
+			'ZTE Racer':								[ STRINGS_ZTE, 'X850 Racer' ],
+			'MTC 916':									[ STRINGS_ZTE, 'X850 Racer' ],
+			'Racer':									[ STRINGS_ZTE, 'X850 Racer' ],
+			'ZTE U X850':								[ STRINGS_ZTE, 'X850 Racer' ],
+			'ZTE U V852':								[ STRINGS_ZTE, 'V852 Dreamer' ],
+			'ZTE N855D':								[ STRINGS_ZTE, 'N855D' ],
+			'ZTE U V856':								[ STRINGS_ZTE, 'V856 Mimosa Mini' ],
+			'ZTE V856':									[ STRINGS_ZTE, 'V856 Mimosa Mini' ],
+			'ZTE U V857':								[ STRINGS_ZTE, 'V857' ],
+			'N860':										[ STRINGS_ZTE, 'N860 Warp' ],
+			'ZTE U? X876!':								[ STRINGS_ZTE, 'X876 Raise' ],
+			'ZTE V877!':								[ STRINGS_ZTE, 'V877' ],
+			'N880':										[ STRINGS_ZTE, 'N880 Blade' ],
+			'ZTE C N880!':								[ STRINGS_ZTE, 'N880 Blade' ],
+			'U880':										[ STRINGS_ZTE, 'U880 Blade' ],
+			'ZTE ?U880!':								[ STRINGS_ZTE, 'U880 Blade' ],
+			'ZTE T ?U880!':								[ STRINGS_ZTE, 'U880 Blade' ],
+			'V880':										[ STRINGS_ZTE, 'V880 Blade' ],
+			'ZTE (U )?V880!':							[ STRINGS_ZTE, 'V880 Blade' ],
+			'ZTE U(V)880+':								[ STRINGS_ZTE, 'V880 Blade' ],
+			'Blade(-V880|-opda)?$!':					[ STRINGS_ZTE, 'V880 Blade' ],
 			'ZTE N880E':								[ STRINGS_ZTE, 'N880E' ],
-			'MIUI N880S':								[ STRINGS_ZTE, 'N880S' ],
 			'ZTE N882E':								[ STRINGS_ZTE, 'N882E' ],
-			'ZTE N910':									[ STRINGS_ZTE, 'N910' ],
-			'E810':										[ STRINGS_ZTE, 'E810' ],
-			'ZTE U880E':								[ STRINGS_ZTE, 'U880E' ],
-			'U880':										[ STRINGS_ZTE, 'U880' ],
-			'ZTE U885':									[ STRINGS_ZTE, 'U885' ],
-			'ZTE U930':									[ STRINGS_ZTE, 'U930' ],
-			'ZTE U970':									[ STRINGS_ZTE, 'U970' ],
-			'ZTE V768':									[ STRINGS_ZTE, 'V768' ],
-			'ZTE V788D':								[ STRINGS_ZTE, 'V788' ],
-			'ZTE V856':									[ STRINGS_ZTE, 'V856' ],
-			'ZTE V877b':								[ STRINGS_ZTE, 'V877' ],
-			'ZTE V889D':								[ STRINGS_ZTE, 'V889' ],
-			'ZTE V970':									[ STRINGS_ZTE, 'Z970' ],
-			'ZTE Z990!':								[ STRINGS_ZTE, 'Z990' ],
+			'BLADEII':									[ STRINGS_ZTE, 'V881 Blade II' ],
+			'Blade2':									[ STRINGS_ZTE, 'V881 Blade II' ],
+			'ZTE U V881':								[ STRINGS_ZTE, 'V881 Blade II' ],			
+			'ZTE ?U885!':								[ STRINGS_ZTE, 'U885' ],
+			'ZTE V889!':								[ STRINGS_ZTE, 'V889' ],
+			'ZTE T ?U900!':								[ STRINGS_ZTE, 'U900' ],	
+			'ZTE N910':									[ STRINGS_ZTE, 'N910 Anthem' ],
+			'ZTE C X920':								[ STRINGS_ZTE, 'X920' ],
+			'ZXY-ZTE-C X920':							[ STRINGS_ZTE, 'X920' ],
+			'ZTE U930':									[ STRINGS_ZTE, 'U930 Grand X' ],
+			'ZTE Grand X':								[ STRINGS_ZTE, 'U930 Grand X' ],
+			'Grand X In':								[ STRINGS_ZTE, 'U930 Grand X' ],
+			'ZTE (U )?V960!':							[ STRINGS_ZTE, 'V960 Skate' ],
+			'ZTE T ?U960!':								[ STRINGS_ZTE, 'U960 Skate' ],
+			'ZTE U960s2':								[ STRINGS_ZTE, 'U960s2' ],
+			'ZTE N970':									[ STRINGS_ZTE, 'N970 Grand X' ],
+			'ZTE U970':									[ STRINGS_ZTE, 'U970 Grand X' ],
+			'ZTE V970':									[ STRINGS_ZTE, 'Z970 Grand X' ],
+			'ZTE U985':									[ STRINGS_ZTE, 'U985 Grand Era' ],
+			'ZTE Roamer':								[ STRINGS_ZTE, 'Z990 Roamer ' ],
+			'ZTE Z990!':								[ STRINGS_ZTE, 'Z990 Roamer' ],
 			'003Z':										[ STRINGS_ZTE, 'Softbank 003Z' ],
 			'008Z':										[ STRINGS_ZTE, 'Softbank 008Z' ],
 			'009Z':										[ STRINGS_ZTE, 'Softbank Star7' ],
@@ -1892,8 +2024,11 @@ var UserAgents = (function(){
 			'i-mobile i695':							[ 'i-Mobile', 'i695' ],
 			'i-mobile i858':							[ 'i-Mobile', 'i858' ],
 			'i-mobile 3G 8500':							[ 'i-Mobile', '3G 8500' ],
+			'i-mobile i-style 3':						[ 'i-Mobile', 'i-Style 3' ],	
 			'i-mobile i-style Q1':						[ 'i-Mobile', 'i-Style Q1' ],						
-			'i-mobile i-STYLE Q2':						[ 'i-Mobile', 'i-Style Q2' ],						
+			'i-mobile i-STYLE Q2':						[ 'i-Mobile', 'i-Style Q2' ],			
+			'i-mobile i-STYLE Q2 DUO':					[ 'i-Mobile', 'i-Style Q2 Duo' ],	
+			'i-mobile i-STYLE Q6':						[ 'i-Mobile', 'i-Style Q6' ],						
 			'i-mobile I-Note':							[ 'i-Mobile', 'i-Note', TYPE_TABLET ],
 	
 			'Optimus Boston':							[ 'Optimus', 'Boston' ],							/* Gigabyte GSmart G1305 */
@@ -2010,6 +2145,7 @@ var UserAgents = (function(){
 			'USCCHTC-PC93100':							[ STRINGS_HTC, 'Arrive' ],
 			'Gold':										[ STRINGS_HTC, 'Gold' ],
 			'HD2':										[ STRINGS_HTC, 'HD2' ],
+			'LEO':										[ STRINGS_HTC, 'HD2' ],
 			'(HD7|.*T92(92|95|96))!':					[ STRINGS_HTC, 'HD7' ],
 			'(7 Pro|.*T75(75|76))!':					[ STRINGS_HTC, '7 Pro' ],
 			'((7 )?Mozart|.*T86(97|98))!':				[ STRINGS_HTC, '7 Mozart' ],
@@ -2028,26 +2164,37 @@ var UserAgents = (function(){
 			'PI39100':									[ STRINGS_HTC, 'Titan' ],
 			'PI86100':									[ STRINGS_HTC, 'Titan II' ],
 			'Ultimate':									[ STRINGS_HTC, 'Ultimate' ],
+			'HTC6990LVW':								[ STRINGS_HTC, '8X' ],
 			'HUAWEI Ascend W1!':						[ STRINGS_HUAWEI, 'Ascend W1' ],
 			'GW910':									[ STRINGS_LG, 'Optimus 7' ],
 			'LG-E-?900!':								[ STRINGS_LG, 'Optimus 7 E900' ],
 			'LG-E906':									[ STRINGS_LG, 'Jil Sander' ],
 			'LG-C900!':									[ STRINGS_LG, 'Optimus 7Q' ],
-			'Lumia 610':								[ 'Nokia', 'Lumia 610' ],
+			'Lumia 510!':								[ 'Nokia', 'Lumia 510' ],
+			'Lumia 610!':								[ 'Nokia', 'Lumia 610' ],
 			'(Lumia |Nokia )?710!':						[ 'Nokia', 'Lumia 710' ],
 			'Lumia 719':								[ 'Nokia', 'Lumia 719' ],
 			'(Lumia |Nokia )?800!':						[ 'Nokia', 'Lumia 800' ],
 			'SeaRay':									[ 'Nokia', 'Lumia 800' ],
-			'Lumia 900':								[ 'Nokia', 'Lumia 900' ],
+			'(Lumia |Nokia )?900!':						[ 'Nokia', 'Lumia 900' ],
 			'XXX':										[ 'Nokia', 'prototype' ],
+			'GT-i8700':									[ STRINGS_SAMSUNG, 'Omnia 7' ],
 			'GT-I8350!':								[ STRINGS_SAMSUNG, 'Omnia W' ],
+			'GT-S7530':									[ STRINGS_SAMSUNG, 'Omnia M' ],
+			'SGH-i667':									[ STRINGS_SAMSUNG, 'Focus 2' ],
 			'SGH-i677':									[ STRINGS_SAMSUNG, 'Focus Flash' ],
 			'SGH-i707':									[ STRINGS_SAMSUNG, 'Taylor' ],
 			'SGH-i917!':								[ STRINGS_SAMSUNG, 'Focus' ],
-			'SGH-i937':									[ STRINGS_SAMSUNG, 'Focus S' ],
-			'OM(NI|IN)A7!':								[ STRINGS_SAMSUNG, 'Omnia 7' ],
+			'SGH-i937!':								[ STRINGS_SAMSUNG, 'Focus S' ],
+			'OM(NI|IN)A ?7!':							[ STRINGS_SAMSUNG, 'Omnia 7' ],
 			'Taylor':									[ STRINGS_SAMSUNG, 'Taylor' ],
-			'TSUNAGI':									[ 'Toshiba', 'Tsunagi' ]
+			'CETUS':									[ STRINGS_SAMSUNG, 'Cetus' ],
+			'I917':										[ STRINGS_SAMSUNG, 'Cetus' ],
+			'S606':										[ 'TCL', 'Horizon S606' ],
+			'TSUNAGI':									[ 'Toshiba', 'Tsunagi' ],
+			'N880e!':									[ STRINGS_ZTE, 'N880e' ],
+			'V965W':									[ STRINGS_ZTE, 'V965W Tania' ],
+			'Tania':									[ STRINGS_ZTE, 'V965W Tania' ]
 		};
 		
 		var BLACKBERRY_MODELS = {

From 2fabb24edc7a8fd6bc9583fa5b17c7f8c7882057 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 11 Nov 2012 23:03:30 +0100
Subject: [PATCH 084/174] Fix Windows Phone detection

---
 scripts/useragents.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 392d804b..6bce9100 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -2683,15 +2683,15 @@ var UserAgents = (function(){
 					this.device.type = TYPE_MOBILE;
 				}
 				
-				if (ua.match('Windows Phone OS')) {
+				if (ua.match('Windows Phone')) {
 					this.os.name = 'Windows Phone';
-					this.os.version = new Version({ value: ua.match(/Windows Phone OS ([0-9.]*)/)[1], details: 2 });
+					this.os.version = new Version({ value: ua.match(/Windows Phone (?:OS )?([0-9.]*)/)[1], details: 2 });
 
 					if (this.os.version < 7) {
 						this.os.name = 'Windows Mobile';
 					}
 
-					if (match = /IEMobile\/[^;]+; ([^;]+); ([^;]+)[;|\)]/.exec(ua)) {
+					if (match = /IEMobile\/[^;]+;(?: ARM; Touch; )?([^;]+); ([^;]+)[;|\)]/.exec(ua)) {
 						this.device = DeviceModels.identify('wp', match[2]);
 						
 						if (!this.device.identified) {

From 7924ec3200583e0bc4fe53cd93d2cf3c14415dbc Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 11 Nov 2012 23:04:14 +0100
Subject: [PATCH 085/174] A device with S60 in the model name was misidentified
 as a Series60 device

---
 scripts/useragents.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 6bce9100..43659839 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -2978,7 +2978,7 @@ var UserAgents = (function(){
 			 *		S60
 			 */
 		
-			if (ua.match('Symbian') || ua.match('Series[ ]?60') || ua.match('S60')) {
+			if (ua.match('Symbian') || ua.match('Series[ ]?60') || ua.match('S60;')) {
 				this.os.name = 'Series60';
 				
 				if (ua.match('SymbianOS/9.1')  && !ua.match('Series60')) {

From b8c0b98396a9e709baa3a79dcade10decba72f7d Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 11 Nov 2012 23:04:40 +0100
Subject: [PATCH 086/174] BREW devices used the wrong database

---
 scripts/useragents.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 43659839..ab74e2fa 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -3130,7 +3130,7 @@ var UserAgents = (function(){
 
 				
 				if (match = /\(([^;]+);U;REX\/[^;]+;BREW\/[^;]+;(?:.*;)?[0-9]+\*[0-9]+;CTC\/2.0\)/.exec(ua)) {
-					this.device = DeviceModels.identify('bada', match[1]);
+					this.device = DeviceModels.identify('brew', match[1]);
 					
 					if (!this.device.identified) {
 					    this.device.model = match[1];

From 14c96ce85032d8f39eb49abe19d4c6947cdfd5da Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 11 Nov 2012 23:05:01 +0100
Subject: [PATCH 087/174] Add Motorola KreaTV

---
 scripts/useragents.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index ab74e2fa..aba05ed7 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -3612,6 +3612,20 @@ var UserAgents = (function(){
 				this.device.type = TYPE_TELEVISION;
 			}
 
+			
+
+			/****************************************************
+			 *		Motorola KreaTV
+			 */
+
+			if (match = /Motorola KreaTV STB/.exec(ua)) {
+				this.os.name = '';
+				this.device.manufacturer = STRINGS_MOTOROLA;
+				this.device.model = 'KreaTV';
+				this.device.type = TYPE_TELEVISION;
+				this.device.identified = true;
+			}
+
 			/****************************************************
 			 *		ADB
 			 */

From 7b79a6fd7f33fc8f6ceaa0fcbb13a3df42d857fd Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 11 Nov 2012 23:06:26 +0100
Subject: [PATCH 088/174] One more way device models can be detected for
 Android

---
 scripts/useragents.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index aba05ed7..65e77270 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -3802,7 +3802,11 @@ var UserAgents = (function(){
 				if (match = /\ ([^\s]+)$/.exec(ua)) {
 					candidates.push(match[1]);
 				}
-
+				
+				if (match = /^([a-z0-9\.\_\+\/ ]+) Linux/i.exec(ua)) {
+					candidates.push(match[1]);
+				}
+				
 				for (var i = 0; i < candidates.length; i++) {
 					if (!this.device.model && !this.device.manufacturer) {
 						var result = false;

From d1ea254a99d3d2b9a924ba41dd40461bd88d08bb Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 11 Nov 2012 23:06:47 +0100
Subject: [PATCH 089/174] Add Pantech device detection

---
 scripts/useragents.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 65e77270..5f7c8d80 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -3888,6 +3888,13 @@ var UserAgents = (function(){
 								this.os.name = 'Series40';
 							}
 						}
+
+						if (match = /^Pantech([^\/_]+)(?:\/|_|$)/.exec(candidates[i])) {
+							this.device.manufacturer = 'Pantech';
+							this.device.model = DeviceModels.cleanup(match[1]);
+							this.device.type = TYPE_MOBILE;
+							this.device.identified = true;
+						}
 		
 						if (match = /^SonyEricsson([^\/_]+)(?:\/|_|$)/.exec(candidates[i])) {
 							this.device.manufacturer = STRINGS_SONY_ERICSSON;

From ad3a64212326d717fd4de2812a13ba0fab5aee7c Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 11 Nov 2012 23:07:02 +0100
Subject: [PATCH 090/174] Fix Touchwiz detection

---
 scripts/useragents.js | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 5f7c8d80..43782b4d 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -3934,15 +3934,17 @@ var UserAgents = (function(){
 									}	
 								}
 								
-								this.device = DeviceModels.identify('touchwiz', this.device.model);
-								if (this.device.identified) {
-									this.os.name = 'Touchwiz';
-		
-									switch(version) {
-										case '1.0':		this.os.version = new Version({ value: '1.0' }); break;						
-										case '1.5':		this.os.version = new Version({ value: '2.0' }); break;							
-										case '2.0':		this.os.version = new Version({ value: '3.0' }); break;					
-									}	
+								else {
+									this.device = DeviceModels.identify('touchwiz', this.device.model);
+									if (this.device.identified) {
+										this.os.name = 'Touchwiz';
+			
+										switch(version) {
+											case '1.0':		this.os.version = new Version({ value: '1.0' }); break;						
+											case '1.5':		this.os.version = new Version({ value: '2.0' }); break;							
+											case '2.0':		this.os.version = new Version({ value: '3.0' }); break;					
+										}	
+									}
 								}
 							}
 							

From cac601045827b98907f2ab8e2161aa98756cd4c4 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 11 Nov 2012 23:07:34 +0100
Subject: [PATCH 091/174] Add Kindle Fire model detection using the Android
 database

---
 scripts/useragents.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 43782b4d..d30929f0 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -4405,10 +4405,16 @@ var UserAgents = (function(){
 						this.browser.version = new Version({ value: match[1], details: 2 });
 					}
 					
-					this.device.manufacturer = 'Amazon';
-					this.device.model = 'Kindle Fire';
-					this.device.type = TYPE_TABLET;
-					this.device.identified = true;
+					if (match = /; ([^;]*[^;\s])\s+Build/.exec(ua)) {
+						this.device = DeviceModels.identify('android', match[1]);
+					}		
+
+					if (!this.device.identified) {
+						this.device.manufacturer = 'Amazon';
+						this.device.model = 'Kindle Fire';
+						this.device.type = TYPE_TABLET;
+						this.device.identified = true;
+					}
 					
 					if (this.os.name != 'Android') {
 						this.os.name = 'Android';

From 8dcfe379e501142fa08113d543427df853ca54b0 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 11 Nov 2012 23:07:58 +0100
Subject: [PATCH 092/174] Add 360 Phone Browser

---
 scripts/useragents.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index d30929f0..8f2ebc2e 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -4765,6 +4765,7 @@ var UserAgents = (function(){
 
 				{ name: '360 Extreme Explorer', regexp: /360EE/ },
 				{ name: '360 Phone Browser', 	regexp: /360 Android Phone Browser \(V([0-9.]*)\)/ },
+				{ name: '360 Phone Browser', 	regexp: /360 Aphone Browser \(Version ([0-9.]*)\)/ },
 				{ name: 'ABrowse', 				regexp: /Abrowse ([0-9.]*)/ },
 				{ name: 'Abrowser', 			regexp: /Abrowser\/([0-9.]*)/ },
 				{ name: 'arora', 				regexp: /[Aa]rora\/([0-9.]*)/ },

From 70727441e11d4dbf67585b2007c45bb5ae364861 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 11 Nov 2012 23:08:10 +0100
Subject: [PATCH 093/174] Add OneBrowser

---
 scripts/useragents.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 8f2ebc2e..39066a44 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -4818,6 +4818,7 @@ var UserAgents = (function(){
 				{ name: 'Netscape Navigator', 	regexp: /Navigator\/([0-9.]*)/, details: 3 },
 				{ name:	'Odyssey',				regexp: /OWB\/([0-9.]*)/ },
 				{ name: 'OmniWeb', 				regexp: /OmniWeb/ },
+				{ name:	'OneBrowser',			regexp: /OneBrowser\/([0-9.]*)/ },
 				{ name:	'Orca',					regexp: /Orca\/([0-9.]*)/ },
 				{ name:	'Open Sankoré',			regexp: /Open-Sankore\/([0-9.]*)/ },
 				{ name: 'Origyn',				regexp: /Origyn Web Browser/ },

From 5fc53b2bc8a947de8d51f301558c91ef60291e78 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 11 Nov 2012 23:16:07 +0100
Subject: [PATCH 094/174] Small formatting issue

---
 scripts/useragents.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 5b903573..aadfa35b 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -4764,7 +4764,7 @@ var UserAgents = (function(){
 				{ name: 'Thunderbird', 			regexp: /Thunderbird\/([0-9.]*)/ },
 
 				{ name: '360 Extreme Explorer', regexp: /QIHU 360EE/ },
-				{ name: '360 Safe Explorer', regexp: /QIHU 360SE/ },
+				{ name: '360 Safe Explorer', 	regexp: /QIHU 360SE/ },
 				{ name: '360 Phone Browser', 	regexp: /360 Android Phone Browser \(V([0-9.]*)\)/ },
 				{ name: '360 Phone Browser', 	regexp: /360 Aphone Browser \(Version ([0-9.]*)\)/ },
 				{ name: 'ABrowse', 				regexp: /Abrowse ([0-9.]*)/ },

From ce9e2a3f74d45bdb54eee5d523c1e3dd1c3cbf00 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 11 Nov 2012 23:16:25 +0100
Subject: [PATCH 095/174] Add Doga Rhodonit browser

---
 scripts/useragents.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index aadfa35b..08e8802c 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -4784,6 +4784,7 @@ var UserAgents = (function(){
 				{ name: 'ChromePlus', 			regexp: /ChromePlus(?:\/([0-9.]*))?$/, details: 3 },
 				{ name: 'Daedalus',				regexp: /Daedalus ([0-9.]*)/, details: 2 },
 				{ name: 'Demobrowser', 			regexp: /demobrowser\/([0-9.]*)/ },
+				{ name: 'Doga Rhodonit',		regexp: /DogaRhodonit/ },
 				{ name: 'Dooble', 				regexp: /Dooble(?:\/([0-9.]*))?/ },
 				{ name: 'Dorothy', 				regexp: /Dorothy$/ },
 				{ name: 'DWB', 					regexp: /dwb(?:-hg)?(?:\/([0-9.]*))?/ },

From 9bb7a99912a0f134952f947226bd969b48fe0336 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Sun, 11 Nov 2012 23:16:38 +0100
Subject: [PATCH 096/174] Add Hive Explorer browser

---
 scripts/useragents.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 08e8802c..52dcb985 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -4793,6 +4793,7 @@ var UserAgents = (function(){
 				{ name: 'Flock', 				regexp: /Flock\/([0-9.]*)/, details: 3 },
 				{ name:	'Galeon',				regexp: /Galeon\/([0-9.]*)/, details: 3 },
 				{ name: 'Helium', 				regexp: /HeliumMobileBrowser\/([0-9.]*)/ },
+				{ name: 'Hive Explorer', 		regexp: /HiveE/ },
 				{ name: 'iCab', 				regexp: /iCab\/([0-9.]*)/ },
 				{ name: 'Iceape', 				regexp: /Iceape\/([0-9.]*)/ },
 				{ name: 'IceCat', 				regexp: /IceCat ([0-9.]*)/ },

From d17665e85d4b12c9685474c481899dd3f5841d83 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Mon, 12 Nov 2012 00:04:51 +0100
Subject: [PATCH 097/174] Add Lumia 820 and 920

---
 scripts/useragents.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 52dcb985..ec4d60a0 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -2176,7 +2176,9 @@ var UserAgents = (function(){
 			'Lumia 719':								[ 'Nokia', 'Lumia 719' ],
 			'(Lumia |Nokia )?800!':						[ 'Nokia', 'Lumia 800' ],
 			'SeaRay':									[ 'Nokia', 'Lumia 800' ],
+			'Lumia 820!':								[ 'Nokia', 'Lumia 820' ],
 			'(Lumia |Nokia )?900!':						[ 'Nokia', 'Lumia 900' ],
+			'Lumia 920!':								[ 'Nokia', 'Lumia 920' ],
 			'XXX':										[ 'Nokia', 'prototype' ],
 			'GT-i8700':									[ STRINGS_SAMSUNG, 'Omnia 7' ],
 			'GT-I8350!':								[ STRINGS_SAMSUNG, 'Omnia W' ],

From d5e9b8f6a853fceed6d37cbd9d6b29f599420617 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Mon, 12 Nov 2012 00:05:21 +0100
Subject: [PATCH 098/174] Add detection of OviBrowser as NokiaBrowser for S40

---
 scripts/useragents.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index ec4d60a0..9701ab80 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -4346,6 +4346,14 @@ var UserAgents = (function(){
 				}
 			}
 			
+			if (ua.match('OviBrowser')) {
+				this.browser.name = 'Nokia Browser';
+
+				if (match = /OviBrowser\/([0-9.]*)/.exec(ua)) {
+					this.browser.version = new Version({ value: match[1], details: 3 });
+				}
+			}
+			
 			/****************************************************
 			 *		Nokia Xpress
 			 *

From e45643cc05cabcf81330ac227a1a0f445fd7bc60 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Mon, 12 Nov 2012 00:05:40 +0100
Subject: [PATCH 099/174] Make sure OviBrowser isn't detected as iBrowser

---
 scripts/useragents.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 9701ab80..d24a5ef9 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -4691,7 +4691,7 @@ var UserAgents = (function(){
 			 *		iBrowser
 			 */
 		
-			if (match = /(iBrowser)\/([0-9.]*)/.exec(ua)) {
+			if (match = /(iBrowser)\/([0-9.]*)/.exec(ua) && !ua.match('OviBrowser')) {
 				this.browser.name = 'iBrowser';
 				
 				var version = match[2];

From 8df78592e2cfb0105a1182b640b6d83d016e2343 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Mon, 12 Nov 2012 00:06:17 +0100
Subject: [PATCH 100/174] Remove OS name from Nokia Xpress proxy browser,
 because it can be both S40 and Windows Phone

---
 scripts/useragents.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index d24a5ef9..37d93e9b 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -4368,7 +4368,6 @@ var UserAgents = (function(){
 					this.browser.version = new Version({ value: match[1], details: 3 });
 				}
 
-				this.os.name = 'Windows Phone';
 				this.device.type = TYPE_MOBILE;
 			}
 			

From 0cb7674b9bc615bd3c781fe2159e9f08a2f43139 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Mon, 12 Nov 2012 00:22:45 +0100
Subject: [PATCH 101/174] Add Windows Phone 8 models

---
 scripts/useragents.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/useragents.js b/scripts/useragents.js
index 37d93e9b..a42ea0f4 100644
--- a/scripts/useragents.js
+++ b/scripts/useragents.js
@@ -2165,6 +2165,7 @@ var UserAgents = (function(){
 			'PI86100':									[ STRINGS_HTC, 'Titan II' ],
 			'Ultimate':									[ STRINGS_HTC, 'Ultimate' ],
 			'HTC6990LVW':								[ STRINGS_HTC, '8X' ],
+			'RIO U':									[ STRINGS_HTC, '8X' ],
 			'HUAWEI Ascend W1!':						[ STRINGS_HUAWEI, 'Ascend W1' ],
 			'GW910':									[ STRINGS_LG, 'Optimus 7' ],
 			'LG-E-?900!':								[ STRINGS_LG, 'Optimus 7 E900' ],
@@ -2176,18 +2177,21 @@ var UserAgents = (function(){
 			'Lumia 719':								[ 'Nokia', 'Lumia 719' ],
 			'(Lumia |Nokia )?800!':						[ 'Nokia', 'Lumia 800' ],
 			'SeaRay':									[ 'Nokia', 'Lumia 800' ],
+			'Lumia 810!':								[ 'Nokia', 'Lumia 810' ],
 			'Lumia 820!':								[ 'Nokia', 'Lumia 820' ],
+			'Lumia 822!':								[ 'Nokia', 'Lumia 822' ],
 			'(Lumia |Nokia )?900!':						[ 'Nokia', 'Lumia 900' ],
 			'Lumia 920!':								[ 'Nokia', 'Lumia 920' ],
-			'XXX':										[ 'Nokia', 'prototype' ],
-			'GT-i8700':									[ STRINGS_SAMSUNG, 'Omnia 7' ],
 			'GT-I8350!':								[ STRINGS_SAMSUNG, 'Omnia W' ],
+			'GT-i8700':									[ STRINGS_SAMSUNG, 'Omnia 7' ],
+			'GT-I8750':									[ STRINGS_SAMSUNG, 'Ativ S' ],
 			'GT-S7530':									[ STRINGS_SAMSUNG, 'Omnia M' ],
 			'SGH-i667':									[ STRINGS_SAMSUNG, 'Focus 2' ],
 			'SGH-i677':									[ STRINGS_SAMSUNG, 'Focus Flash' ],
 			'SGH-i707':									[ STRINGS_SAMSUNG, 'Taylor' ],
 			'SGH-i917!':								[ STRINGS_SAMSUNG, 'Focus' ],
 			'SGH-i937!':								[ STRINGS_SAMSUNG, 'Focus S' ],
+			'SGH-T899M':								[ STRINGS_SAMSUNG, 'Ativ S' ],
 			'OM(NI|IN)A ?7!':							[ STRINGS_SAMSUNG, 'Omnia 7' ],
 			'Taylor':									[ STRINGS_SAMSUNG, 'Taylor' ],
 			'CETUS':									[ STRINGS_SAMSUNG, 'Cetus' ],

From 3c09067397b4f792564f3faccefb51519e45ce94 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Fri, 25 Jan 2013 22:44:20 +0100
Subject: [PATCH 102/174] Add a hybrid JavaScript / PHP implementation of the
 useragent detection library

---
 index.html                            |    4 +-
 scripts/useragents.js                 | 5282 ----------------------
 scripts/useragents/.htaccess          |    1 +
 scripts/useragents/detect.js          |  420 ++
 scripts/useragents/index.php          |   81 +
 scripts/useragents/useragents.lib.php | 6034 +++++++++++++++++++++++++
 6 files changed, 6538 insertions(+), 5284 deletions(-)
 delete mode 100644 scripts/useragents.js
 create mode 100644 scripts/useragents/.htaccess
 create mode 100644 scripts/useragents/detect.js
 create mode 100644 scripts/useragents/index.php
 create mode 100644 scripts/useragents/useragents.lib.php

diff --git a/index.html b/index.html
index 676817b5..01f0d7c2 100644
--- a/index.html
+++ b/index.html
@@ -18,7 +18,7 @@
 
 		<script src='/translation.js' type='text/javascript'></script>
 
-		<script src='/scripts/useragents.js' type='text/javascript'></script>
+		<script src='/scripts/useragents/detect.js?<?php echo preg_replace('/([ ])/e', 'chr(rand(97,122))', '        '); ?>' type='text/javascript'></script>
 		<script src='/scripts/engine.js' type='text/javascript'></script>
 		<script src='/scripts/data.js' type='text/javascript'></script>
 		<script src='/scripts/template.js' type='text/javascript'></script>
@@ -330,7 +330,7 @@ <h2>
 			}
 
 
-			Browsers = new UserAgents(navigator.userAgent, {
+			Browsers = new UserAgents({
 				useFeatures:		true,
 				detectCamouflage:	true
 			});
diff --git a/scripts/useragents.js b/scripts/useragents.js
deleted file mode 100644
index a42ea0f4..00000000
--- a/scripts/useragents.js
+++ /dev/null
@@ -1,5282 +0,0 @@
-var UserAgents = (function(){
-	
-	var STRINGS_ZTE = 'ZTE',
-		STRINGS_TOSHIBA = 'Toshiba',
-		STRINGS_TI = 'Texas Instruments',
-		STRINGS_SAMSUNG = 'Samsung',
-		STRINGS_SHARP = 'Sharp',
-		STRINGS_SONY = 'Sony',
-		STRINGS_SONY_ERICSSON = 'Sony Ericsson',
-		STRINGS_QUALCOMM = 'Qualcomm',
-		STRINGS_PANTECH = 'Pantech',
-		STRINGS_MOTOROLA = 'Motorola',
-		STRINGS_LG = 'LG',
-		STRINGS_LENOVO = 'Lenovo',
-		STRINGS_HUAWEI = 'Huawei',
-		STRINGS_HTC = 'HTC',
-		STRINGS_COOLPAD = 'Coolpad',
-		STRINGS_BN = 'Barnes & Noble',
-		STRINGS_ASUS = 'Asus',
-		STRINGS_ARCHOS = 'Archos',
-		STRINGS_ALCATEL = 'Alcatel',
-		STRINGS_ACER = 'Acer',
-		STRINGS_GALAXY = 'Galaxy',
-		STRINGS_XPERIA = 'Xperia';
-
-	var STRINGS_BASED = ' based device';
-	
-	var TYPE_EREADER = 'ereader',
-		TYPE_MOBILE = 'mobile',
-		TYPE_TABLET = 'tablet',
-		TYPE_TELEVISION = 'television';
-
-	var DeviceModels = (function(){
-		DeviceModels = {
-			identify: function() {
-				var type = Array.prototype.shift.call(arguments);
-				
-				switch(type) {
-					case 'android':		return DeviceModels.identifyAndroid.apply(this, arguments);
-					case 'blackberry':	return DeviceModels.identifyBlackBerry.apply(this, arguments);
-					case 'bada': 		return DeviceModels.identifyList.apply(this, [ BADA_MODELS ].concat(Array.prototype.slice.call(arguments)));
-					case 'brew': 		return DeviceModels.identifyList.apply(this, [ BREW_MODELS ].concat(Array.prototype.slice.call(arguments)));
-					case 'tizen': 		return DeviceModels.identifyList.apply(this, [ TIZEN_MODELS ].concat(Array.prototype.slice.call(arguments)));
-					case 'touchwiz': 	return DeviceModels.identifyList.apply(this, [ TOUCHWIZ_MODELS ].concat(Array.prototype.slice.call(arguments)));
-					case 'wm': 			return DeviceModels.identifyList.apply(this, [ WINDOWS_MOBILE_MODELS ].concat(Array.prototype.slice.call(arguments)));
-					case 'wp': 			return DeviceModels.identifyList.apply(this, [ WINDOWS_PHONE_MODELS ].concat(Array.prototype.slice.call(arguments)));
-				}
-			},
-			
-			identifyList: function(list, model) {
-				model = DeviceModels.cleanup(model);
-			
-				var device = {
-					type:			TYPE_MOBILE,
-					identified:		false,
-					manufacturer:	null,
-					model:			model
-				};
-
-				for (var m in list) {
-					var match = false;
-					if (m.substring(m.length - 1) == "!")
-						match = model.match(new RegExp('^' + m.substring(0,m.length - 1), 'i'));
-					else
-						match = m.toLowerCase() == model.toLowerCase();
-					
-					if (match) {
-	 					device.manufacturer = list[m][0];
-						device.model = list[m][1];
-						if (typeof list[m][2] != 'undefined') device.type = list[m][2];
-						device.identified = true;
-						
-						return device;
-					}
-				}
-				
-				return device;
-			},
-			
-			identifyAndroid: function(model) {
-				var result = DeviceModels.identifyList(ANDROID_MODELS, model);
-
-				if (!result.identified) {
-					model = DeviceModels.cleanup(model);
-					if (model.match(/AndroVM/i) || model == 'Emulator' || model == 'x86 Emulator' || model == 'x86 VirtualBox' || model == 'vm') {
-						return {
-							type:			'emulator',
-							identified:		true,
-							manufacturer:	null,
-							model:			null
-						};
-					}
-				}
-				
-				return result;
-			},
-			
-			identifyBlackBerry: function(model) {
-				if (typeof BLACKBERRY_MODELS[model] != 'undefined') return 'BlackBerry ' + BLACKBERRY_MODELS[model] + ' ' + model;
-				return 'BlackBerry ' + model;
-			},
-
-			cleanup: function(s) {
-				s = typeof s == 'undefined' ? '' : s;
-			
-				s = s.replace(/\/[^/]+$/, "");
-				s = s.replace(/\/[^/]+ Android\/.*/, "");
-
-				s = s.replace(/_TD$/, '');
-				s = s.replace(/_CMCC$/, '');
-		
-				s = s.replace(/_/g, " ");
-				s = s.replace(/^\s+|\s+$/g, "");
-		
-				s = s.replace(/^tita on /, '');
-				s = s.replace(/^ICS AOSP on /, '');
-				s = s.replace(/^Android (on |for )/, '');
-				s = s.replace(/^Full (AOSP on |Android on |Cappuccino on |MIPS Android on |Android)/, '');
-		
-				s = s.replace(/^Acer ?/i, '');
-				s = s.replace(/^Iconia( Tab)? /, '');
-				s = s.replace(/^ASUS ?/, '');
-				s = s.replace(/^Ainol /, '');
-				s = s.replace(/^Coolpad ?/i, 'Coolpad ');
-				s = s.replace(/^ALCATEL /, '');
-				s = s.replace(/^Alcatel OT-(.*)/, 'one touch $1');
-				s = s.replace(/^YL-/, '');
-				s = s.replace(/^Novo7 ?/i, 'Novo7 ');
-				s = s.replace(/^G[iI]ONEE[ -]/, '');
-				s = s.replace(/^HW-/, '');
-				s = s.replace(/^Huawei[ -]/i, 'Huawei ');
-				s = s.replace(/^SAMSUNG[ -]/i, '');
-				s = s.replace(/^(Sony ?Ericsson|Sony)/, '');
-				s = s.replace(/^(Lenovo Lenovo|LNV-Lenovo|LENOVO-Lenovo)/, 'Lenovo');
-				s = s.replace(/^Lenovo-/, 'Lenovo ');
-				s = s.replace(/^ZTE-/, 'ZTE ');
-				s = s.replace(/^(LG)[ _\/]/, '$1-');
-				s = s.replace(/^(HTC.*)\s(?:v|V)?[0-9.]+$/, '$1');
-				s = s.replace(/^(HTC)[-\/]/, '$1 ');
-				s = s.replace(/^(HTC)([A-Z][0-9][0-9][0-9])/, '$1 $2');
-				s = s.replace(/^(Motorola[\s|-])/, '')
-				s = s.replace(/^(Moto|MOT-)/, '')
-
-				s = s.replace(/-?(orange(-ls)?|vodafone|bouygues|parrot|Kust)$/i, '');
-				s = s.replace(/http:\/\/.+$/i, '');
-				s = s.replace(/^\s+|\s+$/g, "");
-		
-				return s;
-			}			
-		};
-
-	
-		var ANDROID_MODELS = {
-			/* Generic identifiers */
-			'Android':									[ null, null ],		
-			'google sdk':								[ null, null ],		
-			'sdk':										[ null, null ],
-			'generic':									[ null, null ],
-			'generic x86':								[ null, null ],
-			
-			/* Development boards and kits */
-			'amd brazos':								[ 'AMD', 'Fusion' + STRINGS_BASED ],
-			'Amlogic M1 reference board':				[ 'Amlogic', 'M1 reference board' ],
-			'AML8726M':									[ 'Amlogic', 'AML8726-M' + STRINGS_BASED ],
-			'vexpress a9':								[ 'ARM', 'Versatile Express development platform' ],
-			'bcm7231':									[ 'Broadcom', 'BCM7231' + STRINGS_BASED, TYPE_TELEVISION ],
-			'bcm7425':									[ 'Broadcom', 'BCM7425' + STRINGS_BASED, TYPE_TELEVISION ],
-			'bcm7429':									[ 'Broadcom', 'BCM7429' + STRINGS_BASED, TYPE_TELEVISION ],
-			'imx50!':									[ 'Freescale', 'i.MX50' + STRINGS_BASED ],
-			'imx51!':									[ 'Freescale', 'i.MX51' + STRINGS_BASED ],
-			'imx53!':									[ 'Freescale', 'i.MX53' + STRINGS_BASED ],
-			'imx6q!':									[ 'Freescale', 'i.MX6Q' + STRINGS_BASED ],
-			'ODROID-A':									[ 'Hardkernel', 'ODROID-A developer tablet', TYPE_TABLET ],
-			'mfld (dv10|dv20|lw00|pr2|pr3)!':			[ 'Intel', 'Medfield' + STRINGS_BASED ],
-			'berlin bg2':								[ 'Marvell', 'Armada 1000' + STRINGS_BASED, TYPE_TELEVISION ],
-			'MStar Amber3':								[ 'MStar', 'Amber3' + STRINGS_BASED ],
-			'Konka Amber3':								[ 'MStar', 'Amber3' + STRINGS_BASED ],
-			'mt5396':									[ 'Mediatek', 'MT5396' + STRINGS_BASED, TYPE_TELEVISION ],
-			'bird75v2':									[ 'Mediatek', 'MT6575' + STRINGS_BASED ],
-			'eagle75v1 2':								[ 'Mediatek', 'MT6575' + STRINGS_BASED ],
-			'mt6575!':									[ 'Mediatek', 'MT6575' + STRINGS_BASED ],		
-			'mt8658':									[ 'Mediatek', 'MT8658' + STRINGS_BASED ],
-			'MBX DVBT reference board (c03ref)':		[ 'MXB', 'DVBT reference board', TYPE_TELEVISION ],
-			'NS2816':									[ 'Nufront', 'NuSmart 2816' + STRINGS_BASED ],
-			'Ventana':									[ 'nVidia', 'Tegra Ventana development kit' ],
-			'Cardhu':									[ 'nVidia', 'Tegra 3' + STRINGS_BASED ],
-			'Panda(Board)?!':							[ 'Pandaboard', 'Development Kit' ],
-			'MSM':										[ STRINGS_QUALCOMM, 'Snapdragon' + STRINGS_BASED ],
-			'msm(7227|7627)!':							[ STRINGS_QUALCOMM, 'Snapdragon S1' + STRINGS_BASED ],
-			'msm7630!':									[ STRINGS_QUALCOMM, 'Snapdragon S2' + STRINGS_BASED ],
-			'msm8660!':									[ STRINGS_QUALCOMM, 'Snapdragon S3' + STRINGS_BASED ],
-			'msm(8625|8960)!':							[ STRINGS_QUALCOMM, 'Snapdragon S4' + STRINGS_BASED ],
-			'msm8974!':									[ STRINGS_QUALCOMM, 'Snapdragon' + STRINGS_BASED ],
-			'rk2808(sdk)?!':							[ 'Rockchip', 'RK2808' + STRINGS_BASED ],
-			'rk2818(sdk)?!':							[ 'Rockchip', 'RK2818' + STRINGS_BASED ],
-			'Android-for-Rockchip-2818':				[ 'Rockchip', 'RK2818' + STRINGS_BASED ],
-			'rk29sdk':									[ 'Rockchip', 'RK29' + STRINGS_BASED ],
-			'rk30sdk':									[ 'Rockchip', 'RK30' + STRINGS_BASED ],
-			's3c6410':									[ STRINGS_SAMSUNG, 'S3C6410' + STRINGS_BASED ],
-			'smdk6410':									[ STRINGS_SAMSUNG, 'S3C6410' + STRINGS_BASED ],
-			'SMDKC110':									[ STRINGS_SAMSUNG, 'Exynos 3110' + STRINGS_BASED ],
-			'SMDKV210':									[ STRINGS_SAMSUNG, 'Exynos 4210' + STRINGS_BASED ],
-			'S5PV210':									[ STRINGS_SAMSUNG, 'Exynos 4210' + STRINGS_BASED ],
-			'sec smdkc210':								[ STRINGS_SAMSUNG, 'Exynos 4210' + STRINGS_BASED ],
-			'SMDK4x12':									[ STRINGS_SAMSUNG, 'Exynos 4212 or 4412' + STRINGS_BASED ],
-			'SMDK5250':									[ STRINGS_SAMSUNG, 'Exynos 5250' + STRINGS_BASED ],									
-			'smp86xx':									[ 'Sigma', 'SMP86xx' + STRINGS_BASED, TYPE_TELEVISION ],
-			'sv8860':									[ 'Skyviia', 'SV8860' + STRINGS_BASED, TYPE_TELEVISION ],
-			'ste u8500':								[ 'ST Ericsson', 'Novathor U8500' + STRINGS_BASED ],
-			'Telechips M801 Evaluation Board':			[ 'Telechips', 'M801' + STRINGS_BASED, TYPE_TELEVISION ],
-			'Telechips TCC8900 Evaluation Board':		[ 'Telechips', 'TCC8900' + STRINGS_BASED, TYPE_TELEVISION ],
-			'TCC8920 STB EV':							[ 'Telechips', 'TCC8920' + STRINGS_BASED, TYPE_TELEVISION ],
-			'OMAP':										[ STRINGS_TI, 'OMAP' + STRINGS_BASED ],
-			'OMAP SS':									[ STRINGS_TI, 'OMAP' + STRINGS_BASED ],
-			'LogicPD Zoom2':							[ STRINGS_TI, 'OMAP' + STRINGS_BASED ],
-			'omap3evm':									[ STRINGS_TI, 'OMAP3' + STRINGS_BASED ],
-			'Omap5sevm':								[ STRINGS_TI, 'OMAP5' + STRINGS_BASED ],
-			'pnx8473 kiryung':							[ 'Trident', 'PNX8473' + STRINGS_BASED, TYPE_TELEVISION ],
-			
-			/* Official Google development devices */
-			'Bravo':									[ STRINGS_HTC, 'Desire' ],
-			'Dream':									[ STRINGS_HTC, 'Dream' ],
-			'Vogue':									[ STRINGS_HTC, 'Touch' ],
-			'Vendor Optimus':							[ STRINGS_LG, 'Optimus' ],
-			'Stingray':									[ STRINGS_MOTOROLA, 'XOOM', TYPE_TABLET ],
-			'Wingray':									[ STRINGS_MOTOROLA, 'XOOM', TYPE_TABLET ],
-			'Blaze':									[ STRINGS_TI, 'Blaze Tablet', TYPE_TABLET ],
-			'Blaze Tablet':								[ STRINGS_TI, 'Blaze Tablet', TYPE_TABLET ],
-			'Google Ion':								[ 'Google', 'Ion' ],
-
-
-			/* Nexus Devices (without official model no. */
-			'Passion':									[ STRINGS_HTC, 'Nexus One' ],
-			'(HTC )?Nexus ?One!':						[ STRINGS_HTC, 'Nexus One' ],
-			'Crespo!':									[ STRINGS_SAMSUNG, 'Nexus S' ],
-			'(Google )?Nexus S!':						[ STRINGS_SAMSUNG, 'Nexus S' ],
-			'Dooderbutt!':								[ STRINGS_SAMSUNG, 'Nexus S' ],
-			'Maguro':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
-			'Toro-VZW':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
-			'Galaxy Nexus':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
-			'(Google )?Nexus 7!':						[ STRINGS_ASUS, 'Nexus 7', TYPE_TABLET ],
-			'Nexus 4':									[ STRINGS_LG, 'Nexus 4' ],
-			'manta':									[ STRINGS_SAMSUNG, 'Nexus 10', TYPE_TABLET ],
-			'Nexus 10':									[ STRINGS_SAMSUNG, 'Nexus 10', TYPE_TABLET ],
-
-			
-			/* Middleware and emulators */
-			'BlueStacks':								[ 'BlueStacks', 'App Player', 'desktop' ],
-			'youwave custom':							[ 'Youwave', 'Android on PC', 'desktop' ],
-			'BlackBerry Runtime for Android Apps':		[ 'RIM', 'BlackBerry (Android Runtime)', TYPE_MOBILE ],
-			
-			/* Regular devices */
-			'A100':										[ STRINGS_ACER, 'Iconia Tab A100', TYPE_TABLET ],
-			'A101':										[ STRINGS_ACER, 'Iconia Tab A101', TYPE_TABLET ],
-			'A110':										[ STRINGS_ACER, 'Iconia Tab A110', TYPE_TABLET ],
-			'A200':										[ STRINGS_ACER, 'Iconia Tab A200', TYPE_TABLET ],
-			'A211':										[ STRINGS_ACER, 'Iconia Tab A211', TYPE_TABLET ],
-			'A500':										[ STRINGS_ACER, 'Iconia Tab A500', TYPE_TABLET ],
-			'A501':										[ STRINGS_ACER, 'Iconia Tab A501', TYPE_TABLET ],
-			'A510':										[ STRINGS_ACER, 'Iconia Tab A510', TYPE_TABLET ],
-			'A511':										[ STRINGS_ACER, 'Iconia Tab A511', TYPE_TABLET ],
-			'A700':										[ STRINGS_ACER, 'Iconia Tab A700', TYPE_TABLET ],
-			'P2A700':									[ STRINGS_ACER, 'Iconia Tab A700', TYPE_TABLET ],
-			'A701':										[ STRINGS_ACER, 'Iconia Tab A701', TYPE_TABLET ],
-			'A800':										[ STRINGS_ACER, 'Iconia Tab A800', TYPE_TABLET ],
-			'E110':										[ STRINGS_ACER, 'beTouch E110' ],
-			'E120':										[ STRINGS_ACER, 'beTouch E120' ],
-			'E130':										[ STRINGS_ACER, 'beTouch E130' ],
-			'E140':										[ STRINGS_ACER, 'beTouch E140' ],
-			'E210':										[ STRINGS_ACER, 'beTouch E210' ],
-			'E310':										[ STRINGS_ACER, 'Liquid mini' ],
-			'E320':										[ STRINGS_ACER, 'Liquid Express' ],
-			'E330':										[ STRINGS_ACER, 'Liquid Glow' ],
-			'E350':										[ STRINGS_ACER, 'Liquid Gallant' ],
-			'E400':										[ STRINGS_ACER, 'beTouch E400' ],
-			'G100W':									[ STRINGS_ACER, 'G100W' ],
-			'S100':										[ STRINGS_ACER, 'Liquid' ],
-			'S110':										[ STRINGS_ACER, 'Stream' ],
-			'S120':										[ STRINGS_ACER, 'Liquid mt' ],
-			'S300':										[ STRINGS_ACER, 'Iconia Smart' ],
-			'S500':										[ STRINGS_ACER, 'CloudMobile' ],
-			'TD600':									[ STRINGS_ACER, 'beTouch TD600' ],
-			'Liquid':									[ STRINGS_ACER, 'Liquid' ],
-			'Liquid E':									[ STRINGS_ACER, 'Liquid E' ],
-			'Liquid MT':								[ STRINGS_ACER, 'Liquid mt' ],
-			'Liquid Metal':								[ STRINGS_ACER, 'Liquid mt' ],
-			'Stream':									[ STRINGS_ACER, 'Stream' ],
-			'N700':										[ 'aigo', 'N700', TYPE_TABLET ],
-			'M801':										[ 'aigo', 'M801', TYPE_TABLET ],
-			'Novo7':									[ 'Ainovo', 'Novo7', TYPE_TABLET ],
-			'Novo7 Aurora':								[ 'Ainovo', 'Novo7 Aurora', TYPE_TABLET ],
-			'Novo7 Advanced':							[ 'Ainovo', 'Novo7 Advanced', TYPE_TABLET ],
-			'Novo7 Advanced2':							[ 'Ainovo', 'Novo7 Advanced 2', TYPE_TABLET ],
-			'Novo7 Basic':								[ 'Ainovo', 'Novo7 Basic', TYPE_TABLET ],
-			'Novo7 ELF':								[ 'Ainovo', 'Novo7 Elf', TYPE_TABLET ],
-			'Novo7 Fire':								[ 'Ainovo', 'Novo7 Fire', TYPE_TABLET ],
-			'Novo7 Flame':								[ 'Ainovo', 'Novo7 Flame', TYPE_TABLET ],
-			'Novo7 PALADIN':							[ 'Ainovo', 'Novo7 Paladin', TYPE_TABLET ],
-			'Novo8 Advanced':							[ 'Ainovo', 'Novo8 Advanced', TYPE_TABLET ],
-			'one touch 890!':							[ STRINGS_ALCATEL, 'One Touch 890' ],
-			'one touch 891!':							[ STRINGS_ALCATEL, 'One Touch 891' ],
-			'one touch 903!':							[ STRINGS_ALCATEL, 'One Touch 903' ],
-			'one touch 906!':							[ STRINGS_ALCATEL, 'One Touch 906' ],
-			'one touch 908!':							[ STRINGS_ALCATEL, 'One Touch 908' ],
-			'one touch 910!':							[ STRINGS_ALCATEL, 'One Touch 910' ],
-			'one touch 918!':							[ STRINGS_ALCATEL, 'One Touch 918' ],
-			'one touch 980!':							[ STRINGS_ALCATEL, 'One Touch 980' ],
-			'one touch 981!':							[ STRINGS_ALCATEL, 'One Touch 981' ],
-			'one touch 986!':							[ STRINGS_ALCATEL, 'One Touch 986' ],
-			'one touch 990!':							[ STRINGS_ALCATEL, 'One Touch 990' ],
-			'one touch 991!':							[ STRINGS_ALCATEL, 'One Touch 991' ],
-			'one touch 993!':							[ STRINGS_ALCATEL, 'One Touch 993' ],
-			'one touch 995!':							[ STRINGS_ALCATEL, 'One Touch 995' ],
-			'one touch 997!':							[ STRINGS_ALCATEL, 'One Touch 997' ],
-			'Telenor OneTouch':							[ STRINGS_ALCATEL, 'One Touch 990' ],
-			'OT 918':									[ STRINGS_ALCATEL, 'One Touch 918' ],
-			'Venture':									[ STRINGS_ALCATEL, 'Venture' ],
-			'Allwinner A10':							[ 'AllWinner', 'A10', TYPE_TABLET ],
-			'97FC':										[ 'AllWinner', 'A10 97FC', TYPE_TABLET ],
-			'(Amazon )?Kindle Fire!':					[ 'Amazon', 'Kindle Fire', TYPE_TABLET ],
-			'KFOT':										[ 'Amazon', 'Kindle Fire', TYPE_TABLET ],	
-			'KFTT':										[ 'Amazon', 'Kindle Fire HD 7"', TYPE_TABLET ],
-			'KFJW(I|A)!':								[ 'Amazon', 'Kindle Fire HD 8.9"', TYPE_TABLET ],
-			'AMOI N89':									[ 'Amoi', 'N89' ],
-			'AMOI N820':								[ 'Amoi', 'N820' ],
-			'AMOI N821':								[ 'Amoi', 'N821' ],
-			'AMD120':									[ 'AnyDATA', 'AnyTAB AMD120', TYPE_TABLET ],
-			'MW0811':									[ 'AOC', 'Breeze MW0811', TYPE_TABLET ],
-			'MW0821 V2.0':								[ 'AOC', 'Breeze MW0821', TYPE_TABLET ],
-			'MW0922':									[ 'AOC', 'Breeze MW0922', TYPE_TABLET ],
-			'Apanda.A60!':								[ 'Apanda', 'A60' ],
-			'apanda-A80S':								[ 'Apanda', 'A80' ],
-			'A80KSC':									[ STRINGS_ARCHOS, 'Arnova 8', TYPE_TABLET ],
-			'AN7CG2':									[ STRINGS_ARCHOS, 'Arnova 7', TYPE_TABLET ],
-			'A101B':									[ STRINGS_ARCHOS, 'Arnova 10', TYPE_TABLET ],
-			'AN10BG2DT':								[ STRINGS_ARCHOS, 'Arnova 10 B', TYPE_TABLET ],
-			'AN10G2':									[ STRINGS_ARCHOS, 'Arnova 10 G2', TYPE_TABLET ],
-			'A32':										[ STRINGS_ARCHOS, '32', 'media' ],
-			'A35DE':									[ STRINGS_ARCHOS, '35 Smart Home Phone' ],
-			'A43':										[ STRINGS_ARCHOS, '43', 'media' ],
-			'Archos5':									[ STRINGS_ARCHOS, '5', 'media' ],
-			'A70H':										[ STRINGS_ARCHOS, '7 Home Tablet', TYPE_TABLET ],					// G7
-			'A70HB':									[ STRINGS_ARCHOS, '7 Home Tablet', TYPE_TABLET ],
-			'A70BHT':									[ STRINGS_ARCHOS, '7 Home Tablet', TYPE_TABLET ],
-			'A70CHT':									[ STRINGS_ARCHOS, '7 Home Tablet', TYPE_TABLET ],
-			'A70S':										[ STRINGS_ARCHOS, '70 Internet Tablet', TYPE_TABLET ],				// G8
-			'A7EB':										[ STRINGS_ARCHOS, '70B Internet Tablet', TYPE_TABLET ],
-			'ARCHOS 70it2':								[ STRINGS_ARCHOS, '70B Internet Tablet', TYPE_TABLET ],		
-			'A101IT':									[ STRINGS_ARCHOS, '101 Internet Tablet', TYPE_TABLET ],		
-			'ARCHOS 80G9':								[ STRINGS_ARCHOS, '80 G9', TYPE_TABLET ],							// G9
-			'ARCHOS 101G9':								[ STRINGS_ARCHOS, '101 G9', TYPE_TABLET ],						
-			'ARCHOS 97XSLG10':							[ STRINGS_ARCHOS, '97 XS', TYPE_TABLET ],							// G10
-			'ARCHOS 101G10':							[ STRINGS_ARCHOS, '101 XS', TYPE_TABLET ],
-			'ARCHOS 97 CARBON':							[ STRINGS_ARCHOS, '97 Carbon', TYPE_TABLET ],						// Elements
-			'ASTRI':									[ 'ASTRI', 'e-reader', TYPE_EREADER ],
-			'eeepc':									[ STRINGS_ASUS, 'Eee Pc' ],
-			'asus laptop':								[ STRINGS_ASUS, 'Eee Pc' ],
-			'ME171':									[ STRINGS_ASUS, 'Eee Pad MeMO', TYPE_TABLET ],
-			'Slider SL101':								[ STRINGS_ASUS, 'Eee Pad Slider', TYPE_TABLET ],
-			'EPAD':										[ STRINGS_ASUS, 'Eee Pad Transformer', TYPE_TABLET ],
-			'TF101':									[ STRINGS_ASUS, 'Eee Pad Transformer', TYPE_TABLET ],
-			'Transformer TF101(G)?!':					[ STRINGS_ASUS, 'Eee Pad Transformer', TYPE_TABLET ],
-			'TF201':									[ STRINGS_ASUS, 'Eee Pad Transformer Prime', TYPE_TABLET ],
-			'Transformer Prime TF201':					[ STRINGS_ASUS, 'Eee Pad Transformer Prime', TYPE_TABLET ],
-			'Transformer Prime':						[ STRINGS_ASUS, 'Eee Pad Transformer Prime', TYPE_TABLET ],
-			'Transformer (Pad )?TF300(T|TG|TL)!':		[ STRINGS_ASUS, 'Transformer Pad 300', TYPE_TABLET ],
-			'Transformer (Pad )?TF700(T|K)!':			[ STRINGS_ASUS, 'Transformer Pad Infinity 700', TYPE_TABLET ],
-			'PadFone':									[ STRINGS_ASUS, 'Padfone', TYPE_TABLET ],
-			'PadFone 2':								[ STRINGS_ASUS, 'Padfone 2', TYPE_TABLET ],
-			'OMS TTD':									[ STRINGS_ASUS, 'Eee Pc T10' ],
-			'ASUS T20':									[ STRINGS_ASUS, 'Eee Pc T20' ],
-			'ETBW11AA':									[ STRINGS_ASUS, 'Tough' ],
-			'AUX V900':									[ 'AUX', 'V900' ],
-			'PICOpad-QGN':								[ 'Axioo', 'Picopad QGN', TYPE_TABLET ],
-			'NOOK':										[ STRINGS_BN, 'NOOK', TYPE_EREADER ],
-			'Nook ?Color!':								[ STRINGS_BN, 'NOOK Color', TYPE_EREADER ],
-			'(NOOK )?BNRV(200|300)!':					[ STRINGS_BN, 'NOOK Color', TYPE_EREADER ],
-			'Nook ?Tablet!':							[ STRINGS_BN, 'NOOK Tablet', TYPE_EREADER ],
-			'(NOOK )?BNTV250!':							[ STRINGS_BN, 'NOOK Tablet', TYPE_EREADER ],
-			'NOOK Slate':								[ STRINGS_BN, 'NOOK Tablet', TYPE_EREADER ],
-			'Barnes & Noble Nook Tablet':				[ STRINGS_BN, 'NOOK Tablet', TYPE_EREADER ],
-			'(NOOK )?BNTV(400)!':						[ STRINGS_BN, 'NOOK HD Tablet', TYPE_EREADER ],
-			'(NOOK )?BNTV(600)!':						[ STRINGS_BN, 'NOOK HD+ Tablet', TYPE_EREADER ],
-			'BenWee 5100':								[ 'BenWee', '5100' ],
-			'CA907AAC0G':								[ 'Besta', 'CA907AAC0G' ],
-			'BM999':									[ 'Bmorn', 'BM999', TYPE_TABLET ],
-			'V11':										[ 'Bmorn', 'V11', TYPE_TABLET ],
-			'V99':										[ 'Bmorn', 'V99', TYPE_TABLET ],
-			'bq DaVinci':								[ 'bq', 'DaVinci', TYPE_TABLET ],
-			'CT704':									[ 'Carrefour', 'CT704', TYPE_TABLET ],
-			'CT1002':									[ 'Carrefour', 'CT1002', TYPE_TABLET ],
-			'Camangi-Mangrove7':						[ 'Camangi', 'Mangrove 7', TYPE_TABLET ],
-			'WS171':									[ 'Camangi', 'WebStation', TYPE_TABLET ],
-			'IS11CA':									[ 'Casio', 'GzOne IS11CA' ],
-			'C771':										[ 'Casio', 'GzOne Commando' ],
-			'CAT NOVA':									[ 'Cat', 'NOVA', TYPE_TABLET ],
-			'ChangHong-Z-ME':							[ 'ChangHong', 'Z-me' ],
-			'ARMM3V':									[ 'chinaleap', 'ARMM3V', TYPE_TABLET ],
-			'CIUS-7!':									[ 'Cisco', 'Cius', TYPE_TABLET ],
-			'CSL Spice MI300':							[ 'CSL', 'Spice MI300' ],
-			'CSL-MI410':								[ 'CSL', 'Spice MI410' ],
-			'MID1024':									[ 'Coby', 'Kyros MID1024', TYPE_TABLET ],
-			'MID1125':									[ 'Coby', 'Kyros MID1125', TYPE_TABLET ],
-			'MID1126':									[ 'Coby', 'Kyros MID1126', TYPE_TABLET ],
-			'MID7010':									[ 'Coby', 'Kyros MID7010', TYPE_TABLET ],
-			'MID7012':									[ 'Coby', 'Kyros MID7012', TYPE_TABLET ],
-			'MID7015!':									[ 'Coby', 'Kyros MID7015', TYPE_TABLET ],
-			'MID7016':									[ 'Coby', 'Kyros MID7016', TYPE_TABLET ],
-			'MID7020':									[ 'Coby', 'Kyros MID7020', TYPE_TABLET ],
-			'MID7022':									[ 'Coby', 'Kyros MID7022', TYPE_TABLET ],
-			'MID7024':									[ 'Coby', 'Kyros MID7024', TYPE_TABLET ],
-			'MID7025':									[ 'Coby', 'Kyros MID7025', TYPE_TABLET ],
-			'MID7035':									[ 'Coby', 'Kyros MID7035', TYPE_TABLET ],
-			'MID7127':									[ 'Coby', 'Kyros MID7127', TYPE_TABLET ],
-			'MID8024':									[ 'Coby', 'Kyros MID8024', TYPE_TABLET ],
-			'MID8125':									[ 'Coby', 'Kyros MID8125', TYPE_TABLET ],
-			'MID8127':									[ 'Coby', 'Kyros MID8127', TYPE_TABLET ],
-			'Z71':										[ 'Commtiva', 'Z71' ],
-			'V-T100':									[ 'Commtiva', 'V-T100' ],
-			'FIH-FB0':									[ 'Commtiva', 'HD700'],
-			'Coolpad D510':								[ STRINGS_COOLPAD, 'D510' ],
-			'D530':										[ STRINGS_COOLPAD, 'D530' ],
-			'Coolpad D530':								[ STRINGS_COOLPAD, 'D530' ],
-			'D539':										[ STRINGS_COOLPAD, 'D539' ],
-			'Coolpad D539':								[ STRINGS_COOLPAD, 'D539' ],
-			'E239':										[ STRINGS_COOLPAD, 'E239' ],
-			'Coolpad E239':								[ STRINGS_COOLPAD, 'E239' ],
-			'Coolpad N930':								[ STRINGS_COOLPAD, 'N930' ],
-			'N930':										[ STRINGS_COOLPAD, 'N930' ],
-			'Coolpad W706!':							[ STRINGS_COOLPAD, 'W706' ],
-			'Coolpad W708':								[ STRINGS_COOLPAD, 'W708' ],
-			'W711':										[ STRINGS_COOLPAD, 'W711' ],
-			'Coolpad 5210':								[ STRINGS_COOLPAD, '5210' ],
-			'Coolpad 5820':								[ STRINGS_COOLPAD, '5820' ],
-			'5832':										[ STRINGS_COOLPAD, '5832' ],
-			'Coolpad 5832':								[ STRINGS_COOLPAD, '5832' ],
-			'5855':										[ STRINGS_COOLPAD, '5855' ],
-			'Coolpad 5860!':							[ STRINGS_COOLPAD, '5860' ],
-			'5860':										[ STRINGS_COOLPAD, '5860' ],
-			'Coolpad 5870':								[ STRINGS_COOLPAD, '5870' ],
-			'Coolpad 7005':								[ STRINGS_COOLPAD, '7005' ],
-			'Coolpad 7019!':							[ STRINGS_COOLPAD, '7019' ],
-			'Coolpad 7230':								[ STRINGS_COOLPAD, '7230' ],
-			'7260':										[ STRINGS_COOLPAD, '7260' ],
-			'Coolpad 7260!':							[ STRINGS_COOLPAD, '7260' ],
-			'Coolpad 8013':								[ STRINGS_COOLPAD, '8013' ],
-			'Coolpad 8026':								[ STRINGS_COOLPAD, '8026' ],
-			'Coolpad 8809':								[ STRINGS_COOLPAD, '8809' ],
-			'Coolpad 8810':								[ STRINGS_COOLPAD, '8810' ],
-			'8810':										[ STRINGS_COOLPAD, '8810' ],
-			'Coolpad 8811':								[ STRINGS_COOLPAD, '8811' ],
-			'Coolpad 9900':								[ STRINGS_COOLPAD, '9900' ],
-			'Coolpad 9960':								[ STRINGS_COOLPAD, '9960' ],
-			'ZiiO7':									[ 'Creative', 'ZiiO 7', TYPE_TABLET ],
-			'ZiiLABS ZiiO7':							[ 'Creative', 'ZiiO 7', TYPE_TABLET ],
-			'ZiiLABS ZiiO10 ':							[ 'Creative', 'ZiiO 10', TYPE_TABLET ],
-			'CUBE K8GT A':								[ 'Cube', 'K8GT A', TYPE_TABLET ],
-			'CUBE K8GT B':								[ 'Cube', 'K8GT B', TYPE_TABLET ],
-			'K8GT C':									[ 'Cube', 'K8GT C', TYPE_TABLET ],
-			'K8GT H':									[ 'Cube', 'K8GT H', TYPE_TABLET ],
-			'CUBE K8GT H':								[ 'Cube', 'K8GT H', TYPE_TABLET ],
-			'K8GT W':									[ 'Cube', 'K8GT W', TYPE_TABLET ],
-			'CUBE U8GT':								[ 'Cube', 'U8GT', TYPE_TABLET ],
-			'CUBE U9GT':								[ 'Cube', 'U9GT', TYPE_TABLET ],
-			'CUBE U9GT ?2!':							[ 'Cube', 'U9GT 2', TYPE_TABLET ],
-			'U9GT':										[ 'Cube', 'U9GT', TYPE_TABLET ],
-			'U9GT2!':									[ 'Cube', 'U9GT 2', TYPE_TABLET ],
-			'N90 From moage.com':						[ 'Cube', 'U9GT 2', TYPE_TABLET ],
-			'U9GT S':									[ 'Cube', 'U9GT S', TYPE_TABLET ],
-			'U9GT S A':									[ 'Cube', 'U9GT SA', TYPE_TABLET ],
-			'U9GTS A':									[ 'Cube', 'U9GT SA', TYPE_TABLET ],
-			'U10GT 2':									[ 'Cube', 'U10GT 2', TYPE_TABLET ],
-			'U10GT S':									[ 'Cube', 'U10GT S', TYPE_TABLET ],
-			'CUBE U15GT':								[ 'Cube', 'U15GT', TYPE_TABLET ],
-			'U30GT-H':									[ 'Cube', 'U30GT H', TYPE_TABLET ],
-			'U30GT-M':									[ 'Cube', 'U30GT M', TYPE_TABLET ],
-			'CUBE Q7PRO':								[ 'Cube', 'Q7 Pro', TYPE_TABLET ],
-			'CUBE Q7PRO J':								[ 'Cube', 'Q7 Pro', TYPE_TABLET ],
-			'Cydle M7!':								[ 'Cydle', 'M7 MultiPAD', TYPE_TABLET ],
-			'Dell Aero':								[ 'Dell', 'Aero' ],
-			'Dell M01M':								[ 'Dell', 'Mini 5', TYPE_TABLET ],
-			'Dell Streak':								[ 'Dell', 'Streak', TYPE_TABLET ],
-			'001DL':									[ 'Dell', 'Streak', TYPE_TABLET ],
-			'101DL':									[ 'Dell', 'Streak Pro', TYPE_TABLET ],
-			'GS01':										[ 'Dell', 'Streak Pro', TYPE_TABLET ],
-			'Dell Streak Pro':							[ 'Dell', 'Streak Pro', TYPE_TABLET ],
-			'streak7':									[ 'Dell', 'Streak 7', TYPE_TABLET ],
-			'Dell Streak 7':							[ 'Dell', 'Streak 7', TYPE_TABLET ],
-			'Dell Streak 10 Pro':						[ 'Dell', 'Streak 10 Pro', TYPE_TABLET ],
-			'Dell V04B':								[ 'Dell', 'Streak V04B', TYPE_TABLET ],
-			'Dell Venue':								[ 'Dell', 'Venue' ],
-			'Dell XCD35':								[ 'Dell', 'XCD35' ],
-			'XCD35':									[ 'Dell', 'XCD35' ],
-			'iDx7':										[ 'Digma', 'iDx7', TYPE_TABLET ],
-			'iDx10!':									[ 'Digma', 'iDx10', TYPE_TABLET ],
-			'DM009SH':									[ 'Disney Mobile', 'DM009SH' ],
-			'DM010SH':									[ 'Disney Mobile', 'DM010SH' ],
-			'DM012SH':									[ 'Disney Mobile', 'DM012SH' ],
-			'F-08D':									[ 'Disney Mobile', 'F-08D' ],
-			'P-05D':									[ 'Disney Mobile', 'P-05D' ],
-			'Tablet-P27':								[ 'DracoTek', 'P27 Tablet', TYPE_TABLET ],
-			'edgejr':									[ 'EnTourage', 'Pocket eDGe', TYPE_TABLET ],
-			'l97D':										[ 'EPad', 'l97D', TYPE_TABLET ],
-			'M4301':									[ 'Eston', 'MID M4301', 'media' ],
-			'P10AN':									[ 'Exper', 'Easypad P10AN', TYPE_TABLET ],
-			'FIH-F0X':									[ 'FIH', 'F0X' ],
-			'Fly IQ245':								[ 'Fly', 'IQ245 Wizard' ],
-			'Fly IQ260':								[ 'Fly', 'IQ260 BlackBird' ],
-			'Fly IQ441':								[ 'Fly', 'IQ441 Radiance' ],
-			'ISW11F':									[ 'Fujitsu', 'Arrows Z' ],
-			'ISW13F':									[ 'Fujitsu', 'Arrows Z' ],
-			'IS12F':									[ 'Fujitsu', 'Arrows ES' ],
-			'F-01D':									[ 'Fujitsu', 'Arrows Tab LTE', TYPE_TABLET ],
-			'F-03D':									[ 'Fujitsu', 'Arrows Kiss' ],
-			'F-05D':									[ 'Fujitsu', 'Arrows X LTE' ],
-			'F-07D':									[ 'Fujitsu', 'Arrows μ' ],
-			'F-10D':									[ 'Fujitsu', 'Arrows X F-10D' ],
-			'F-12C':									[ 'Fujitsu', 'Globetrotter' ],
-			'f12arc':									[ 'Fujitsu', 'F12arc' ],
-			'M532':										[ 'Fujitsu', 'Stylistic M532', TYPE_TABLET ],
-			'Garminfone':								[ 'Garmin-Asus', 'Garminfone' ],
-			'Garmin-Asus A10':							[ 'Garmin-Asus', 'Nuvifone A10' ],
-			'Garmin-Asus A50':							[ 'Garmin-Asus', 'Nuvifone A50' ],
-			'TPA60W':									[ 'Gateway', 'TPA60W', TYPE_TABLET ],
-			'Geeksphone ZERO':							[ 'Geeksphone', 'ZERO'],
-			'Gemei G2':									[ 'Gemei', 'G2', TYPE_TABLET ],
-			'Gemei G3':									[ 'Gemei', 'G3', TYPE_TABLET ],
-			'Gemei G9':									[ 'Gemei', 'G9', TYPE_TABLET ],
-			'GSmart G1317D':							[ 'Gigabyte', 'GSmart G1317D' ],
-			'GSmart G1342':								[ 'Gigabyte', 'GSmart G1342' ],
-			'GSmart G1345':								[ 'Gigabyte', 'GSmart G1345' ],
-			'Gigabyte TB100':							[ 'Gigabyte', 'TB100', TYPE_TABLET ],
-			'GIO-GiONEE C500':							[ 'Gionee', 'C500' ],
-			'GIO-GiONEE C600':							[ 'Gionee', 'C600' ],
-			'GN100':									[ 'Gionee', 'GN100' ],		
-			'GN105':									[ 'Gionee', 'GN105' ],		
-			'GN109':									[ 'Gionee', 'GN109' ],
-			'GN180':									[ 'Gionee', 'GN180' ],
-			'GN200':									[ 'Gionee', 'GN200' ],		
-			'GN205':									[ 'Gionee', 'GN205' ],
-			'GN305':									[ 'Gionee', 'GN305' ],
-			'GN360':									[ 'Gionee', 'GN360' ],
-			'GN700T':									[ 'Gionee', 'GN700T' ],
-			'GN858':									[ 'Gionee', 'GN858' ],
-			'Haier-HT-I617':							[ 'Haier', 'HT-I617' ],
-			'Haier HW-W910':							[ 'Haier', 'HW-W910' ],
-			'X720D':									[ 'Haipai', 'X720D' ],
-			'SN10T1':									[ 'HANNspree', 'HANNSpad SN10T1', TYPE_TABLET ],
-			'SN10T2':									[ 'HANNspree', 'HANNSpad SN10T2', TYPE_TABLET ],
-			'HannsComb':								[ 'HANNspree', 'HANNSpad', TYPE_TABLET ],
-			'X1':										[ 'HCL', 'ME X1', TYPE_TABLET ],
-			'MID Ser(ai|ia)ls!':						[ 'Herotab', 'C8', TYPE_TABLET ],
-			'HS-9DTB4':									[ 'Hipstreet', '9" Flare tablet', TYPE_TABLET ],
-			'COSMO DUO':								[ 'Hiscreen', 'Cosmo DUO', TYPE_TABLET ],
-			'HS-U8':									[ 'Hisense', 'U8' ],
-			'HS-U950':									[ 'Hisense', 'U950' ],
-			'HS-T92':									[ 'Hisense', 'T92' ],
-			'HS-T96':									[ 'Hisense', 'T96' ],
-			'HS-T909':									[ 'Hisense', 'T909' ],
-			'HS-E860':									[ 'Hisense', 'E860' ],
-			'E860':										[ 'Hisense', 'E860' ],
-			'HS-E910':									[ 'Hisense', 'E910' ],
-			'HS-E920':									[ 'Hisense', 'E920' ],
-			'HS-EG900':									[ 'Hisense', 'EG900' ],
-			'HS-EG906':									[ 'Hisense', 'EG906' ],
-			'HS-ET919':									[ 'Hisense', 'ET919' ],
-			'EG968B':									[ 'Hisense', 'EG968B' ],
-			'HKPHONE H8-3G':							[ 'HKPhone', 'H8 3G' ],
-			'HOSIN U2':									[ 'Hosin', 'U2' ],
-			'(HP )?Touchpad!':							[ 'HP', 'TouchPad', TYPE_TABLET ],
-			'(cm|aokp) tenderloin!':					[ 'HP', 'TouchPad', TYPE_TABLET ],
-			'Amaze 4G':									[ STRINGS_HTC, 'Amaze 4G' ],
-			'HTC (Amaze|Ruby)!':						[ STRINGS_HTC, 'Amaze 4G' ],
-			'HTC (Aria|Liberty)!':						[ STRINGS_HTC, 'Aria' ],
-			'HTC A63(66|80)!':							[ STRINGS_HTC, 'Aria' ],
-			'HTC Bee':									[ STRINGS_HTC, 'Bee' ],
-			'HTC ChaCha!':								[ STRINGS_HTC, 'ChaCha' ],
-			'HTC A810e':								[ STRINGS_HTC, 'ChaCha' ],
-			'HTC A9188!':								[ STRINGS_HTC, 'Cullinan' ],
-			'HTC Desire C':								[ STRINGS_HTC, 'Desire C' ],
-			'HTC Desire ?HD!':							[ STRINGS_HTC, 'Desire HD' ],
-			'HTC A91(91|92)!':							[ STRINGS_HTC, 'Desire HD' ],
-			'HTC Desire ?S( |$)!':						[ STRINGS_HTC, 'Desire S' ],
-			'HTC S510(b|e)!':							[ STRINGS_HTC, 'Desire S' ],
-			'HTC Desire Saga':							[ STRINGS_HTC, 'Desire S' ],
-			'HTC Saga':									[ STRINGS_HTC, 'Desire S' ],
-			'HTC Desire V':								[ STRINGS_HTC, 'Desire V' ],
-			'HTC T328w':								[ STRINGS_HTC, 'Desire V' ],
-			'HTC Desire VC':							[ STRINGS_HTC, 'Desire VC' ],
-			'HTC T328d':								[ STRINGS_HTC, 'Desire VC' ],
-			'HTC Desire VT':							[ STRINGS_HTC, 'Desire VT' ],
-			'HTC T328t':								[ STRINGS_HTC, 'Desire VT' ],
-			'HTC Desire ?Z!':							[ STRINGS_HTC, 'Desire Z' ],
-			'HTC Vision':								[ STRINGS_HTC, 'Desire Z' ],
-			'HTC A72(71|72)!':							[ STRINGS_HTC, 'Desire Z' ],
-			'HTC Desire!':								[ STRINGS_HTC, 'Desire' ],
-			'HTC Bravo':								[ STRINGS_HTC, 'Desire' ],
-			'HTC A81(81|83)!':							[ STRINGS_HTC, 'Desire' ],
-			'HTC ?X06HT!':								[ STRINGS_HTC, 'Desire' ],
-			'HTC Dream':								[ STRINGS_HTC, 'Dream' ],
-			'HTC Droid Incredible':						[ STRINGS_HTC, 'Droid Incredible' ],
-			'HTC S710d':								[ STRINGS_HTC, 'Droid Incredible 2' ],
-			'HTC Incredible 2':							[ STRINGS_HTC, 'Droid Incredible 2' ],
-			'HTC EVO ?3D!':								[ STRINGS_HTC, 'EVO 3D' ],
-			'HTC X51(5a|5c|5d|5m)!':					[ STRINGS_HTC, 'EVO 3D' ],
-			'HTC EVO 4G\+!':							[ STRINGS_HTC, 'EVO 4G+' ],
-			'HTC X515e':								[ STRINGS_HTC, 'EVO 4G+' ],
-			'HTC EVO ?4G!':								[ STRINGS_HTC, 'EVO 4G' ],
-			'HTC ?(EVO ?)?Design ?4G!':					[ STRINGS_HTC, 'EVO Design 4G' ],		
-			'HTC C715c':								[ STRINGS_HTC, 'EVO Design 4G' ],
-			'HTC EVO Shift!':							[ STRINGS_HTC, 'EVO Shift' ],
-			'HTC Explorer!':							[ STRINGS_HTC, 'Explorer' ],
-			'HTC A31(0b|0e)!':							[ STRINGS_HTC, 'Explorer' ],
-			'HTC Flyer!':								[ STRINGS_HTC, 'Flyer', TYPE_TABLET ],
-			'HTC P51(0e|2|5e)!':						[ STRINGS_HTC, 'Flyer', TYPE_TABLET ],
-			'HTC Gratia!':								[ STRINGS_HTC, 'Gratia' ],
-			'HTC A6380':								[ STRINGS_HTC, 'Gratia' ],
-			'HTC HD':									[ STRINGS_HTC, 'HD' ],
-			'HTC HD2!':									[ STRINGS_HTC, 'HD2' ],
-			'HTC T8585':								[ STRINGS_HTC, 'HD2' ],
-			'HTC HD7!':									[ STRINGS_HTC, 'HD7' ],
-			'HTC T9299!':								[ STRINGS_HTC, 'HD7' ],
-			'HTC HD7S!':								[ STRINGS_HTC, 'HD7s' ],
-			'HTC T(93|98)99!':							[ STRINGS_HTC, 'HD7s' ],
-			'VitMod ExtraLite 1.6.5.fullodex for HTC HD7 Pro':		[ STRINGS_HTC, 'HD7 Pro' ],
-			'HTC HERO200':								[ STRINGS_HTC, 'Hero 200' ],			/* Sprint */
-			'HTC Hero S':								[ STRINGS_HTC, 'Hero S' ],				/* US Cellular */
-			'HTC Hero!':								[ STRINGS_HTC, 'Hero' ],
-			'HTC H3000C':								[ STRINGS_HTC, 'Hero' ],
-			'HTC IMAGIO':								[ STRINGS_HTC, 'Imagio' ],
-			'HTC Incredible':							[ STRINGS_HTC, 'Incredible' ],
-			'HTC Incredible ?S!':						[ STRINGS_HTC, 'Incredible S' ],
-			'HTC Vivo':									[ STRINGS_HTC, 'Incredible S' ],
-			'HTC S710e!':								[ STRINGS_HTC, 'Incredible S' ],
-			'HTC Innovation':							[ STRINGS_HTC, 'Innovation' ],
-			'HTC (HD7 )?Inspire!':						[ STRINGS_HTC, 'Inspire 4G' ],
-			'HTC J Z321e':								[ STRINGS_HTC, 'J' ],
-			'HTC P715a':								[ STRINGS_HTC, 'Jetstream', TYPE_TABLET ],
-			'HTC Legend':								[ STRINGS_HTC, 'Legend' ],
-			'HTC Magic':								[ STRINGS_HTC, 'Magic' ],
-			'HTC Sapphire':								[ STRINGS_HTC, 'Magic' ],
-			'HTC Lexikon':								[ STRINGS_HTC, 'Merge' ],
-			'HTC One S':								[ STRINGS_HTC, 'One S' ],
-			'HTC Z(52|56)0e!':							[ STRINGS_HTC, 'One S' ],
-			'HTC One V':								[ STRINGS_HTC, 'One V' ],
-			'HTC T320e':								[ STRINGS_HTC, 'One V' ],
-			'HTC H2000C':								[ STRINGS_HTC, 'One V' ],
-			'HTC One X':								[ STRINGS_HTC, 'One X' ],
-			'HTC Endeavour!':							[ STRINGS_HTC, 'One X' ],
-			'HTC S720e':								[ STRINGS_HTC, 'One X' ],
-			'HTC One X+':								[ STRINGS_HTC, 'One X+' ],
-			'HTC OneXplus':								[ STRINGS_HTC, 'One X+' ],
-			'HTC PM63100':								[ STRINGS_HTC, 'One X+' ],
-			'HTC One XL':								[ STRINGS_HTC, 'One XL' ],
-			'HTC S720t':								[ STRINGS_HTC, 'One XT' ],
-			'HTC Raider!':								[ STRINGS_HTC, 'Raider 4G' ],
-			'HTC Holiday':								[ STRINGS_HTC, 'Raider 4G' ],
-			'HTC X710(a|e|s)!':							[ STRINGS_HTC, 'Raider 4G' ],
-			'HTC PH39100':								[ STRINGS_HTC, 'Raider 4G' ],
-			'HTC Rezound':								[ STRINGS_HTC, 'Rezound' ],
-			'HTC Rhyme!':								[ STRINGS_HTC, 'Rhyme' ],
-			'HTC Bliss!':								[ STRINGS_HTC, 'Rhyme' ],
-			'HTC S510b':								[ STRINGS_HTC, 'Rhyme' ],
-			'HTC Salsa!':								[ STRINGS_HTC, 'Salsa' ],	
-			'HTC C510e':								[ STRINGS_HTC, 'Salsa' ],
-			'HTC Sensation.*XE!':						[ STRINGS_HTC, 'Sensation XE' ],
-			'HTC .*Z715(a|e)!':							[ STRINGS_HTC, 'Sensation XE' ],
-			'HTC Sensation.*XL!':						[ STRINGS_HTC, 'Sensation XL' ],
-			'HTC Runnymede':							[ STRINGS_HTC, 'Sensation XL' ],
-			'HTC .*X315(b|e)!':							[ STRINGS_HTC, 'Sensation XL' ],
-			'HTC G21!':									[ STRINGS_HTC, 'Sensation XL' ],
-			'HTC Sensation!':							[ STRINGS_HTC, 'Sensation' ],
-			'HTC Pyramid!':								[ STRINGS_HTC, 'Sensation' ],
-			'HTC .*Z710(a|e|t)?!':						[ STRINGS_HTC, 'Sensation' ],
-			'HTC G14!':									[ STRINGS_HTC, 'Sensation' ],
-			'HTC Status':								[ STRINGS_HTC, 'Status' ],
-			'HTC PH06130':								[ STRINGS_HTC, 'Status' ],
-			'HTC Tattoo!':								[ STRINGS_HTC, 'Tattoo' ],
-			'HTC Click':								[ STRINGS_HTC, 'Tattoo' ],
-			'HTC A3288':								[ STRINGS_HTC, 'Tattoo' ],
-			'HTC A9188':								[ STRINGS_HTC, 'Tianxi' ],
-			'HTC X310e':								[ STRINGS_HTC, 'Titan' ],
-			'HTC T7373':								[ STRINGS_HTC, 'Touch Pro II' ],
-			'HTC ThunderBolt':							[ STRINGS_HTC, 'ThunderBolt'],	
-			'HTC Mecha':								[ STRINGS_HTC, 'ThunderBolt'],
-			'HTC Velocity!':							[ STRINGS_HTC, 'Velocity 4G'],
-			'HTC Wildfire ?S!':							[ STRINGS_HTC, 'Wildfire S' ],	
-			'HTC .*A510(a|b|c|e)!':						[ STRINGS_HTC, 'Wildfire S' ],
-			'HTC Wildfire!':							[ STRINGS_HTC, 'Wildfire' ],
-			'HTC .*A33(33|66|80)!':						[ STRINGS_HTC, 'Wildfire' ],
-			'HTC A6390':								[ STRINGS_HTC, 'A6390' ],
-			'HTC A8180':								[ STRINGS_HTC, 'A8180' ],
-			'HTC PG762':								[ STRINGS_HTC, 'PG762' ],
-			'HTC S610d':								[ STRINGS_HTC, 'S610d' ],
-			'HTC S715e':								[ STRINGS_HTC, 'S715e' ],
-			'HTC Z510d':								[ STRINGS_HTC, 'Z510d' ],
-			'HTC VLE U':								[ STRINGS_HTC, 'One S' ],
-			'HTC VLE#U':								[ STRINGS_HTC, 'One S' ],
-			'HTC VIE U':								[ STRINGS_HTC, 'One S' ],
-			'HTC EVA UL':								[ STRINGS_HTC, 'One V' ],
-			'HTC DLX U':								[ STRINGS_HTC, 'Droid DNA' ],
-			'HTC DLX WL':								[ STRINGS_HTC, 'Droid DNA' ],
-			'HTC6435LVW!':								[ STRINGS_HTC, 'Droid DNA' ],
-			'DLX':										[ STRINGS_HTC, 'Droid DNA' ],
-			'HTC ENR U':								[ STRINGS_HTC, 'One X' ],
-			'ENR U':									[ STRINGS_HTC, 'One X' ],
-			'EndeavorU':								[ STRINGS_HTC, 'One X' ],
-			'HTC EVARE UL':								[ STRINGS_HTC, 'One X+' ],
-			'Liberty':									[ STRINGS_HTC, 'Aria' ],
-			'Desire HD!':								[ STRINGS_HTC, 'Desire HD' ],
-			'Desire ?S!':								[ STRINGS_HTC, 'Desire S' ],
-			'Desire Z':									[ STRINGS_HTC, 'Desire Z' ],
-			'Desire!':									[ STRINGS_HTC, 'Desire' ],
-			'Dream':									[ STRINGS_HTC, 'Dream' ],
-			'GinDream/GinMagic':						[ STRINGS_HTC, 'Dream' ],
-			'SiRF Dream':								[ STRINGS_HTC, 'Dream' ],
-			'Droid Incredible':							[ STRINGS_HTC, 'Droid Incredible' ],
-			'Incredible':								[ STRINGS_HTC, 'Droid Incredible' ],	/* Verizon */
-			'Incredible 2':								[ STRINGS_HTC, 'Droid Incredible 2' ],	/* Verizon */
-			'EVO':										[ STRINGS_HTC, 'EVO' ],
-			'Evo HD2':									[ STRINGS_HTC, 'EVO HD' ],
-			'EVO ?3D!':									[ STRINGS_HTC, 'EVO 3D' ],
-			'EVO 4G':									[ STRINGS_HTC, 'EVO 4G' ],
-			'photon':									[ STRINGS_HTC, 'HD mini' ],
-			'HD2':										[ STRINGS_HTC, 'HD2' ],
-			'NexusHD2':									[ STRINGS_HTC, 'HD2' ],
-			'Nexus HD2':								[ STRINGS_HTC, 'HD2' ],
-			'HD7  Pro':									[ STRINGS_HTC, 'HD7 Pro' ],
-			'Hero':										[ STRINGS_HTC, 'Hero' ],
-			'HERO CDMA':								[ STRINGS_HTC, 'Hero' ],
-			'HERO200':									[ STRINGS_HTC, 'Hero 200' ],
-			'Incredible ?S!':							[ STRINGS_HTC, 'Incredible S' ],
-			'Inspire HD':								[ STRINGS_HTC, 'Inspire 4G' ],
-			'Inspire 4G':								[ STRINGS_HTC, 'Inspire 4G' ],
-			'Legend':									[ STRINGS_HTC, 'Legend' ],
-			'Docomo HT-03A':							[ STRINGS_HTC, 'Magic' ],
-			'One X':									[ STRINGS_HTC, 'One X' ],
-			'One V':									[ STRINGS_HTC, 'One V' ],
-			'MIUI.us Sensation 4G':						[ STRINGS_HTC, 'Sensation 4G' ],
-			'SensationXE!':								[ STRINGS_HTC, 'Sensation XE' ],
-			'SensationXL!':								[ STRINGS_HTC, 'Sensation XL' ],
-			'Sensation!':								[ STRINGS_HTC, 'Sensation' ],
-			'Pyramid':									[ STRINGS_HTC, 'Sensation' ],
-			'TripNiCE Pyramid':							[ STRINGS_HTC, 'Sensation' ],
-			'Click':									[ STRINGS_HTC, 'Tattoo' ],
-			'Wildfire S!':								[ STRINGS_HTC, 'Wildfire S' ],
-			'Wildfire!':								[ STRINGS_HTC, 'Wildfire' ],
-			'Sprint APX515CKT':							[ STRINGS_HTC, 'EVO 3D' ],
-			'Sprint APA9292KT':							[ STRINGS_HTC, 'EVO 4G' ],
-			'Sprint APA7373KT':							[ STRINGS_HTC, 'EVO Shift 4G' ],
-			'Sprint APC715CKT':							[ STRINGS_HTC, 'EVO Design 4G' ],
-			'A3380':									[ STRINGS_HTC, 'Wildfire' ],
-			'A6277':									[ STRINGS_HTC, 'Hero' ],
-			'a7272':									[ STRINGS_HTC, 'Desire Z' ],					
-			'A7272+(HTC DesireZ)':						[ STRINGS_HTC, 'Desire Z' ],					
-			'S31HT':									[ STRINGS_HTC, 'Aria' ],
-			'S710d':									[ STRINGS_HTC, 'Droid Incredible 2' ],
-			'S710D':									[ STRINGS_HTC, 'Droid Incredible 2' ],
-			'X06HT':									[ STRINGS_HTC, 'Desire' ],
-			'001HT':									[ STRINGS_HTC, 'Desire HD' ],
-			'X325a':									[ STRINGS_HTC, 'One X' ],
-			'Z520m':									[ STRINGS_HTC, 'One S' ],
-			'Z710':										[ STRINGS_HTC, 'Sensation' ],
-			'Z710e':									[ STRINGS_HTC, 'Sensation' ],
-			'T9199h':									[ STRINGS_HTC, 'T9199h' ],
-			'ADR6200':									[ STRINGS_HTC, 'Droid Eris' ],
-			'ADR6300':									[ STRINGS_HTC, 'Droid Incredible' ],
-			'ADR6325VW':								[ STRINGS_HTC, 'Merge' ],	
-			'ADR6330VW':								[ STRINGS_HTC, 'Rhyme' ],	
-			'ADR6350':									[ STRINGS_HTC, 'Droid Incredible 2' ],
-			'ADR6400L!':								[ STRINGS_HTC, 'Thunderbolt 4G' ],
-			'ADR6410LVW!':								[ STRINGS_HTC, 'Fireball' ],
-			'ADR6425LVW!':								[ STRINGS_HTC, 'Rezound' ],
-			'Coquettish Red':							[ STRINGS_HTC, 'Rezound' ],
-			'PB99400':									[ STRINGS_HTC, 'Droid Incredible' ],	
-			'pcdadr6350':								[ STRINGS_HTC, 'Droid Incredible 2' ],
-			'PC36100':									[ STRINGS_HTC, 'EVO 4G' ],
-			'PG06100':									[ STRINGS_HTC, 'EVO Shift 4G' ],
-			'PG41200':									[ STRINGS_HTC, 'EVO View 4G', TYPE_TABLET ],
-			'PG86100!':									[ STRINGS_HTC, 'EVO 3D' ],
-			'PH44100':									[ STRINGS_HTC, 'EVO Design 4G' ],
-			'PJ83100':									[ STRINGS_HTC, 'One X' ],
-			'PM63100':									[ STRINGS_HTC, 'One X+' ],
-			'ISW11HT':									[ STRINGS_HTC, 'EVO 4G' ],
-			'ISW12HT':									[ STRINGS_HTC, 'EVO 3D' ],
-			'ISW13HT':									[ STRINGS_HTC, 'J' ],
-			'USCCADR6275US!':							[ STRINGS_HTC, 'Desire' ],
-			'USCCADR6285US!':							[ STRINGS_HTC, 'Hero S' ],
-			'USCCADR6325US!':							[ STRINGS_HTC, 'Merge' ],
-			'MediaPad':									[ STRINGS_HUAWEI, 'MediaPad', TYPE_TABLET ],
-			'Huawei MediaPad':							[ STRINGS_HUAWEI, 'MediaPad', TYPE_TABLET ],
-			'Huawei S7-312u':							[ STRINGS_HUAWEI, 'MediaPad', TYPE_TABLET ],
-			'MediaPad 7 Lite':							[ STRINGS_HUAWEI, 'MediaPad 7 Lite', TYPE_TABLET ],
-			'MediaPad 10 FHD':							[ STRINGS_HUAWEI, 'MediaPad 10', TYPE_TABLET ],
-			'Huawei C8500!':							[ STRINGS_HUAWEI, 'C8500' ],
-			'Huawei C8600':								[ STRINGS_HUAWEI, 'C8600' ],
-			'Huawei C8650!':							[ STRINGS_HUAWEI, 'C8650' ],
-			'Huawei C8800':								[ STRINGS_HUAWEI, 'IDEOS X5' ],
-			'Huawei C8810':								[ STRINGS_HUAWEI, 'Ascend G300' ],
-			'Huawei C8812!':							[ STRINGS_HUAWEI, 'Ascend C8812' ],
-			'Huawei C8825D':							[ STRINGS_HUAWEI, 'Ascend G330C' ],
-			'Huawei C8860E':							[ STRINGS_HUAWEI, 'Honor' ],
-			'Huawei G300':								[ STRINGS_HUAWEI, 'Ascend G300' ],
-			'Huawei M835':								[ STRINGS_HUAWEI, 'M835' ],
-			'Huawei M860':								[ STRINGS_HUAWEI, 'Ascend' ],
-			'Huawei M920':								[ STRINGS_HUAWEI, 'M920' ],
-			'Huawei M921':								[ STRINGS_HUAWEI, 'M921' ],
-			'Huawei M931':								[ STRINGS_HUAWEI, 'M931' ],
-			'Huawei S8520':								[ STRINGS_HUAWEI, 'S8520' ],
-			'Huawei S8600':								[ STRINGS_HUAWEI, 'S8600' ],
-			'Huawei T8100':								[ STRINGS_HUAWEI, 'T8100' ],
-			'Huawei T8300':								[ STRINGS_HUAWEI, 'T8300' ],
-			'Huawei ?T8500!':							[ STRINGS_HUAWEI, 'T8500' ],
-			'Huawei T8600':								[ STRINGS_HUAWEI, 'T8600' ],
-			'Huawei T8620':								[ STRINGS_HUAWEI, 'Ascend Y200T' ],
-			'Huawei T8828':								[ STRINGS_HUAWEI, 'Ascend G305T' ],
-			'Huawei T8830':								[ STRINGS_HUAWEI, 'Ascend G309T' ],
-			'Huawei T8950':								[ STRINGS_HUAWEI, 'Honor+' ],
-			'Huawei T9200':								[ STRINGS_HUAWEI, 'Ascend P1' ],
-			'Huawei U8220':								[ STRINGS_HUAWEI, 'U8220' ],
-			'Huawei U8500':								[ STRINGS_HUAWEI, 'IDEOS X2' ],
-			'Huawei ?U8520!':							[ STRINGS_HUAWEI, 'U8520 Duplex' ],
-			'Huawei ?U8650!':							[ STRINGS_HUAWEI, 'Sonic' ],
-			'Huawei U8652':								[ STRINGS_HUAWEI, 'Sonic' ],
-			'Huawei U8661':								[ STRINGS_HUAWEI, 'Sonic+' ],
-			'Huawei U8666!':							[ STRINGS_HUAWEI, 'Ascend Y201' ],
-			'Huawei U8800!':							[ STRINGS_HUAWEI, 'IDEOS X5' ],
-			'Huawei U8815':								[ STRINGS_HUAWEI, 'Ascend G300' ],
-			'Huawei U8818':								[ STRINGS_HUAWEI, 'Ascend G300' ],
-			'Huawei U8825D':							[ STRINGS_HUAWEI, 'Ascend G330D' ],
-			'Huawei U8850':								[ STRINGS_HUAWEI, 'Vision' ],
-			'Huawei U8950!':							[ STRINGS_HUAWEI, 'Ascend G600' ],
-			'Huawei U9000':								[ STRINGS_HUAWEI, 'Ascend X' ],
-			'Huawei U9510!':							[ STRINGS_HUAWEI, 'Ascend D quad' ],
-			'Huawei D2-0082':							[ STRINGS_HUAWEI, 'Ascend D2' ],
-			'Huawei IDEOS U8500':						[ STRINGS_HUAWEI, 'IDEOS X2' ],
-			'Huawei IDEOS U8650':						[ STRINGS_HUAWEI, 'Sonic' ],
-			'Huawei IDEOS X3':							[ STRINGS_HUAWEI, 'IDEOS X3' ],
-			'Huawei Ideos X5!':							[ STRINGS_HUAWEI, 'IDEOS X5' ],
-			'Huawei SONIC':								[ STRINGS_HUAWEI, 'Sonic' ],
-			'Huawei 8100-9':							[ STRINGS_HUAWEI, 'U8100' ],
-			'Ascend G300':								[ STRINGS_HUAWEI, 'Ascend G300' ],
-			'Huawei Y300!':								[ STRINGS_HUAWEI, 'Ascend Y300' ],
-			'FUSIONideos':								[ STRINGS_HUAWEI, 'IDEOS' ],
-			'Gnappo Ideos':								[ STRINGS_HUAWEI, 'IDEOS' ],
-			'Ideos':									[ STRINGS_HUAWEI, 'IDEOS' ],
-			'IDEOS X5':									[ STRINGS_HUAWEI, 'IDEOS X5' ],
-			'IDEOS S7!':								[ STRINGS_HUAWEI, 'IDEOS S7', TYPE_TABLET ],
-			'Huawei S7':								[ STRINGS_HUAWEI, 'IDEOS S7', TYPE_TABLET ],
-			'SONIC':									[ STRINGS_HUAWEI, 'Sonic' ],
-			'Kyivstar Aqua':							[ STRINGS_HUAWEI, 'Sonic' ],
-			'Lucky Ultra Sonic U8650':					[ STRINGS_HUAWEI, 'Sonic' ],
-			'Turkcell T20':								[ STRINGS_HUAWEI, 'Sonic' ],
-			'MTC 950':									[ STRINGS_HUAWEI, 'U8160' ],
-			'MTC 955':									[ STRINGS_HUAWEI, 'Sonic' ],
-			'MTC Evo':									[ STRINGS_HUAWEI, 'C8500' ],
-			'MTC Android':								[ STRINGS_HUAWEI, 'U8110' ],
-			'S31HW':									[ STRINGS_HUAWEI, 'Pocket WiFi S' ],
-			'S41HW':									[ STRINGS_HUAWEI, 'Pocket WiFi S II' ],
-			'007HW':									[ STRINGS_HUAWEI, 'Vision' ],	
-			'201HW':									[ STRINGS_HUAWEI, 'Ascend P1' ],
-			'UM840':									[ STRINGS_HUAWEI, 'Evolution' ],	
-			'M860':										[ STRINGS_HUAWEI, 'Ascend' ],
-			'M865':										[ STRINGS_HUAWEI, 'Ascend II' ],
-			'M886':										[ STRINGS_HUAWEI, 'Glory' ],
-			'C8150':									[ STRINGS_HUAWEI, 'IDEOS' ],
-			'C8500!':									[ STRINGS_HUAWEI, 'C8500' ],
-			'C8600':									[ STRINGS_HUAWEI, 'C8600' ],
-			'C8650':									[ STRINGS_HUAWEI, 'C8650' ],
-			'C8800':									[ STRINGS_HUAWEI, 'C8800' ],
-			'C8810':									[ STRINGS_HUAWEI, 'Ascend G300C' ],
-			'C8812':									[ STRINGS_HUAWEI, 'Ascend C8812' ],
-			'S8600':									[ STRINGS_HUAWEI, 'S8600' ],
-			'T8620':									[ STRINGS_HUAWEI, 'Ascend Y200T' ],
-			'U8100':									[ STRINGS_HUAWEI, 'U8100' ],
-			'U8110':									[ STRINGS_HUAWEI, 'U8110' ],
-			'U8120':									[ STRINGS_HUAWEI, 'U8120' ],
-			'U8180':									[ STRINGS_HUAWEI, 'IDEOS X1' ],
-			'U8220':									[ STRINGS_HUAWEI, 'Pulse' ],
-			'U8300':									[ STRINGS_HUAWEI, 'U8300' ],
-			'U8350':									[ STRINGS_HUAWEI, 'Boulder' ],
-			'U8150':									[ STRINGS_HUAWEI, 'IDEOS' ],
-			'U8160':									[ STRINGS_HUAWEI, 'U8160' ],
-			'U8180':									[ STRINGS_HUAWEI, 'IDEOS X1' ],
-			'U8500':									[ STRINGS_HUAWEI, 'IDEOS X2' ],
-			'U8500 HiQQ':								[ STRINGS_HUAWEI, 'U8500 HiQQ Edition' ],
-			'U8510':									[ STRINGS_HUAWEI, 'IDEOS X3' ],
-			'U8650!':									[ STRINGS_HUAWEI, 'Sonic' ],
-			'U8660':									[ STRINGS_HUAWEI, 'Sonic' ],
-			'U8800 ?Pro!':								[ STRINGS_HUAWEI, 'IDEOS X5 Pro' ],
-			'U8800!':									[ STRINGS_HUAWEI, 'IDEOS X5' ],
-			'U8815':									[ STRINGS_HUAWEI, 'Ascend G300' ],
-			'U8818':									[ STRINGS_HUAWEI, 'Ascend G300' ],
-			'U8820':									[ STRINGS_HUAWEI, 'Titan' ],
-			'U8850':									[ STRINGS_HUAWEI, 'Vision' ],
-			'U8860':									[ STRINGS_HUAWEI, 'Honor' ],
-			'U9000':									[ STRINGS_HUAWEI, 'Ascend X' ],
-			'U9200!':									[ STRINGS_HUAWEI, 'Ascend P1' ],
-			'U9500':									[ STRINGS_HUAWEI, 'Ascend D1' ],
-			'U9501L':									[ STRINGS_HUAWEI, 'Ascend D LTE' ],
-			'U9510!':									[ STRINGS_HUAWEI, 'Ascend D quad' ],
-			'Comet':									[ STRINGS_HUAWEI, 'Comet' ],
-			'GS02':										[ STRINGS_HUAWEI, 'Honor' ],
-			'GS03':										[ STRINGS_HUAWEI, 'Ascend P1' ],
-			'DroniX-0.5':								[ STRINGS_HUAWEI, 'U8180' ],
-			'MTS-SP101':								[ STRINGS_HUAWEI, 'C8511' ],
-			'TSP21':									[ STRINGS_HUAWEI, 'U8110' ],
-			'HW-01E':									[ STRINGS_HUAWEI, 'Ascend HW-01E' ],								
-			'HYUNDAI H6':								[ 'Hyundai', 'Storm H6' ],
-			'iBall Slide i7011':						[ 'iBall', 'Slide i7011' ],
-			'NetTAB RUNE':								[ 'IconBit', 'NetTab Rune', TYPE_TABLET ],
-			'D70W':										[ 'Icoo', 'D70W', TYPE_TABLET ],
-			'D80':										[ 'Icoo', 'D80', TYPE_TABLET ],
-			'INFOBAR A01':								[ 'iida', 'INFOBAR A01' ],
-			'M009F':									[ 'Infotmic', 'M009F' ],
-			'AZ210A':									[ 'Intel', 'AZ210A' ],
-			'AZ210B':									[ 'Intel', 'AZ210B' ],
-			'AZ510':									[ 'Intel', 'AZ510' ],
-			'BT210':									[ 'Intel', 'BT210' ],
-			'BT510':									[ 'Intel', 'BT510' ],
-			'greenridge':								[ 'Intel', 'Green Ridge', TYPE_TABLET ],
-			'INQ Cloud Touch':							[ 'INQ', 'Cloud Touch' ],
-			'ILT-MX100':								[ 'iRiver', 'Tab', TYPE_TABLET ],
-			'IVIO_DE38':								[ 'Ivio', 'DE38' ],
-			'JY-G2':									[ 'Jiayu', 'G2' ],
-			'JXD S601WIFI':								[ 'JXD', 'S601 WIFI', 'media' ],
-			'A2':										[ 'KakaTech', 'A2' ],
-			'D91':										[ 'KK', 'D91', TYPE_TABLET ],
-			'K080':										[ 'Kobo', 'K080', TYPE_EREADER ],
-			'A106':										[ 'koobee', 'A160' ],
-			'KPT A9':									[ 'KPT', 'A9' ],
-			'EV-S100':									[ 'Kttech', 'Take EV-S100' ],
-			'KM-E100':									[ 'Kttech', 'Take LTE KM-E100' ],
-			'KM-S120':									[ 'Kttech', 'Take 2 KM-S120' ],
-			'KM-S200':									[ 'Kttech', 'Take Janus KM-S200' ],
-			'KM-S220':									[ 'Kttech', 'Take Tachy KM-S220' ],
-			'Kyobo mirasol eReader':					[ 'Kyobo', TYPE_EREADER, TYPE_EREADER ],
-			'ISW11K':									[ 'Kyocera', 'Digno' ],
-			'JC-KSP8000':								[ 'Kyocera', 'Echo' ],
-			'KSP8000':									[ 'Kyocera', 'Echo' ],
-			'Zio':										[ 'Kyocera', 'Zio' ],
-			'C5155':									[ 'Kyocera', 'C5155' ],
-			'C5170':									[ 'Kyocera', 'C5170' ],
-			'M9300':									[ 'Kyocera', 'M9300' ],
-			'K-Touch E619':								[ 'K-Touch', 'E619' ],
-			'E800':										[ 'K-Touch', 'E800' ],
-			'K-TouchT580':								[ 'K-Touch', 'T580' ],
-			'K-Touch V9':								[ 'K-Touch', 'V9' ],
-			'W606':										[ 'K-Touch', 'W606' ],
-			'K-Touch W619':								[ 'K-Touch', 'W619' ],
-			'K-Touch W621':								[ 'K-Touch', 'W621' ],
-			'K-Touch W650':								[ 'K-Touch', 'W650' ],
-			'K-Touch W688':								[ 'K-Touch', 'W688' ],
-			'W700':										[ 'K-Touch', 'W700' ],
-			'W732':										[ 'K-Touch', 'W732' ],
-			'K-Touch W760':								[ 'K-Touch', 'W760' ],
-			'W800':										[ 'K-Touch', 'W800' ],
-			'K-Touch W806+':							[ 'K-Touch', 'W806' ],
-			'W806':										[ 'K-Touch', 'W806' ],
-			'W808':										[ 'K-Touch', 'W808' ],
-			'W810':										[ 'K-Touch', 'W810' ],
-			'W880':										[ 'K-Touch', 'W880' ],
-			'X900':										[ 'Lava', 'XOLO X900' ],
-			'ThinkPad( Tablet)?!':						[ STRINGS_LENOVO, 'ThinkPad Tablet', TYPE_TABLET ],
-			'(Ideapad )?K1!':							[ STRINGS_LENOVO, 'IdeaPad K1', TYPE_TABLET ],
-			'Ideapad S10-3T':							[ STRINGS_LENOVO, 'IdeaPad S10-3T', TYPE_TABLET ],
-			'S2005A-H':									[ STRINGS_LENOVO, 'S2005A' ],
-			'IdeaTab ?A2107(A-H)!':						[ STRINGS_LENOVO, 'IdeaTab A2107A', TYPE_TABLET ],
-			'IdeaTab ?A2109(A)!':						[ STRINGS_LENOVO, 'IdeaTab A2109A', TYPE_TABLET ],
-			'IdeaTab ?K2110(A-F)!':						[ STRINGS_LENOVO, 'IdeaTab K2110A', TYPE_TABLET ],
-			'IdeaTab ?S2007(A-D)!':						[ STRINGS_LENOVO, 'IdeaTab S2007A', TYPE_TABLET ],
-			'IdeaTab ?V2007(A|A-D-I)!':					[ STRINGS_LENOVO, 'IdeaTab V2007A', TYPE_TABLET ],
-			'IdeaTab ?V2010(A)!':						[ STRINGS_LENOVO, 'IdeaTab V2010A', TYPE_TABLET ],
-			'A1 07':									[ STRINGS_LENOVO, 'LePad', TYPE_TABLET ],
-			'lepad 001b':								[ STRINGS_LENOVO, 'LePad', TYPE_TABLET ],
-			'lepad 001n':								[ STRINGS_LENOVO, 'LePad', TYPE_TABLET ],
-			'(Lenovo )?3GC101!':						[ STRINGS_LENOVO, 'LePhone 3GC101' ],
-			'(Lenovo )?3GW100!':						[ STRINGS_LENOVO, 'LePhone 3GW100' ],
-			'(Lenovo |Lephone )?3GW101!':				[ STRINGS_LENOVO, 'LePhone 3GW101' ],
-			'Lenovo A1-32AB0':							[ STRINGS_LENOVO, 'LePhone A1-32AB0' ],
-			'Lenovo S1-37AH0':							[ STRINGS_LENOVO, 'LePhone S1-37AH0' ],
-			'S1 37AHO':									[ STRINGS_LENOVO, 'LePhone S1-37AH0' ],
-			'Lenovo S2-38AH0':							[ STRINGS_LENOVO, 'LePhone S2-38AH0' ],
-			'Lenovo S2-38AT0':							[ STRINGS_LENOVO, 'LePhone S2-38AT0' ],
-			'Lenovo A288t':								[ STRINGS_LENOVO, 'LePhone A288' ],
-			'Lenovo A300':								[ STRINGS_LENOVO, 'LePhone A300' ],
-			'Lenovo A366t':								[ STRINGS_LENOVO, 'LePhone A366' ],
-			'Lenovo A390e':								[ STRINGS_LENOVO, 'LePhone A390' ],
-			'Lenovo A500':								[ STRINGS_LENOVO, 'LePhone A500' ],
-			'Lenovo A520!':								[ STRINGS_LENOVO, 'LePhone A520' ],
-			'Lenovo A560e':								[ STRINGS_LENOVO, 'LePhone A560' ],
-			'Lenovo A660':								[ STRINGS_LENOVO, 'LePhone A660' ],
-			'Lenovo A668t':								[ STRINGS_LENOVO, 'LePhone A668' ],
-			'Lenovo A698t':								[ STRINGS_LENOVO, 'LePhone A698' ],
-			'Lenovo A710e':								[ STRINGS_LENOVO, 'LePhone A710' ],
-			'Lenovo A750':								[ STRINGS_LENOVO, 'LePhone A750' ],
-			'Lenovo A780':								[ STRINGS_LENOVO, 'LePhone A780' ],
-			'Lenovo A789':								[ STRINGS_LENOVO, 'LePhone A789' ],
-			'Lenovo A790e':								[ STRINGS_LENOVO, 'LePhone A790' ],
-			'Lenovo K860':								[ STRINGS_LENOVO, 'LePhone K860' ],
-			'Lenovo P70':								[ STRINGS_LENOVO, 'LePhone P70' ],
-			'Lenovo P700!':								[ STRINGS_LENOVO, 'LePhone P700' ],
-			'Lenovo S560':								[ STRINGS_LENOVO, 'S560' ],
-			'Lenovo S680':								[ STRINGS_LENOVO, 'S680' ],
-			'Lenovo S720':								[ STRINGS_LENOVO, 'S720' ],
-			'Lenovo S850e':								[ STRINGS_LENOVO, 'S850' ],
-			'Lenovo S880':								[ STRINGS_LENOVO, 'S880' ],
-			'Lenovo ?S899!':							[ STRINGS_LENOVO, 'S899' ],
-			'A30t':										[ STRINGS_LENOVO, 'A30t' ],
-			'Lenovo A60+?!':							[ STRINGS_LENOVO, 'A60' ],
-			'Lenovo A65':								[ STRINGS_LENOVO, 'A65' ],
-			'Lenovo A66t':								[ STRINGS_LENOVO, 'A66t' ],
-			'Lenovo A68e':								[ STRINGS_LENOVO, 'A68e' ],
-			'Lenovo K800':								[ STRINGS_LENOVO, 'K800' ],
-			'IDEA TV T100':								[ STRINGS_LENOVO, 'IDEA TV', TYPE_TELEVISION ],
-			'IDEA TV K91':								[ STRINGS_LENOVO, 'IDEA TV', TYPE_TELEVISION ],
-			'TC970':									[ 'Le Pan', 'TC970', TYPE_TABLET ],
-			'LePanII':									[ 'Le Pan', 'II', TYPE_TABLET ],
-			'LG-C555':									[ STRINGS_LG, 'Optimus Chat' ],
-			'LG-C660!':									[ STRINGS_LG, 'Optimus Pro' ],
-			'LG-C729':									[ STRINGS_LG, 'DoublePlay' ],
-			'LG-C800G':									[ STRINGS_LG, 'Eclypse' ],
-			'LG-CX670':									[ STRINGS_LG, 'Optimus 3G' ],
-			'LG-E400!':									[ STRINGS_LG, 'Optimus L3' ],
-			'LG-E405!':									[ STRINGS_LG, 'Optimus L3 Dual' ],
-			'LG-E435!':									[ STRINGS_LG, 'E435' ],
-			'LG-E455!':									[ STRINGS_LG, 'E455' ],
-			'LG-E510!':									[ STRINGS_LG, 'Optimus Hub' ],
-			'LG-E6(10|12|17)!':							[ STRINGS_LG, 'Optimus L5' ],
-			'LG-E615!':									[ STRINGS_LG, 'Optimus L5 Dual' ],
-			'LG-E720!':									[ STRINGS_LG, 'Optimus Chic' ],
-			'LG-E730':									[ STRINGS_LG, 'Optimus Sol' ],
-			'LG-E960':									[ STRINGS_LG, 'Nexus 4' ],
-			'LG-E970':									[ STRINGS_LG, 'Shine' ],
-			'LG-E9(71|73)!':							[ STRINGS_LG, 'Optimus G' ],
-			'LG-F100!':									[ STRINGS_LG, 'Optimus Vu' ],
-			'LG-F120!':									[ STRINGS_LG, 'Optimus LTE Tag' ],
-			'LG-F160!':									[ STRINGS_LG, 'Optimus LTE II' ],
-			'LG-F180!':									[ STRINGS_LG, 'Optimus G' ],
-			'LG-F200!':									[ STRINGS_LG, 'Optimus Vu 2' ],
-			'LG-F260!':									[ STRINGS_LG, 'F260' ],
-			'LG-GT540!':								[ STRINGS_LG, 'Optimus' ],
-			'LG-GW620':									[ STRINGS_LG, 'GW620 Eve' ],
-			'LG-KH5200':								[ STRINGS_LG, 'Andro-1' ],
-			'LG-KU3700':								[ STRINGS_LG, 'Optimus One' ],
-			'LG-KU5400':								[ STRINGS_LG, 'PRADA 3.0' ],
-			'LG-KU5900':								[ STRINGS_LG, 'Optimus Black' ],
-			'LG-L40G':									[ STRINGS_LG, 'L40G' ],
-			'LG-LG730':									[ STRINGS_LG, 'Venice' ],
-			'LG-LG855':									[ STRINGS_LG, 'Marquee' ],
-			'LG-LS670':									[ STRINGS_LG, 'Optimus S' ],
-			'LG-LS696':									[ STRINGS_LG, 'Elite' ],
-			'LG-LS840':									[ STRINGS_LG, 'Viper' ],
-			'LG-LS855':									[ STRINGS_LG, 'Marquee' ],
-			'LG-LS860':									[ STRINGS_LG, 'Mach' ],
-			'LG-LS970':									[ STRINGS_LG, 'Eclipse' ],
-			'LG-LU3000':								[ STRINGS_LG, 'Optimus Mach' ],
-			'LG-LU3100':								[ STRINGS_LG, 'Optimus Chic' ],
-			'LG-LU3700':								[ STRINGS_LG, 'Optimus One' ],
-			'LG-LU5400':								[ STRINGS_LG, 'PRADA 3.0' ],
-			'LG-LU6200':								[ STRINGS_LG, 'Optimus Q2' ],
-			'LG-LU6500':								[ STRINGS_LG, 'Optimus Note' ],
-			'LG-LU6800':								[ STRINGS_LG, 'Optimus Big' ],
-			'LG-LU8300':								[ STRINGS_LG, 'Optimus Pad LTE' ],
-			'LG-LW690':									[ STRINGS_LG, 'Optimus C' ],
-			'LG-LW770':									[ STRINGS_LG, 'Regard' ],
-			'LG-MS690':									[ STRINGS_LG, 'Optimus M' ],
-			'LG-MS770':									[ STRINGS_LG, 'Motion 4G' ],
-			'LG-MS840':									[ STRINGS_LG, 'Connect 4G' ],
-			'LG-MS870':									[ STRINGS_LG, 'MS870' ],
-			'LG-MS910':									[ STRINGS_LG, 'Esteem' ],
-			'LG-MS695':									[ STRINGS_LG, 'Optimus M+' ],
-			'LG-P350!':									[ STRINGS_LG, 'Optimus Me' ],
-			'LG-P355':									[ STRINGS_LG, 'P355' ],
-			'LG-P5(00|03|04)!':							[ STRINGS_LG, 'Optimus One' ],
-			'LG-P505!':									[ STRINGS_LG, 'Phoenix' ],
-			'LG-P506':									[ STRINGS_LG, 'Thrive' ],
-			'LG-P509':									[ STRINGS_LG, 'Optimus T' ],
-			'LG-P6(90|98)':								[ STRINGS_LG, 'Optimus Net' ],
-			'LG-P693':									[ STRINGS_LG, 'P693' ],
-			'LG-P7(00|05|08)!':							[ STRINGS_LG, 'Optimus L7' ],
-			'LG-P720!':									[ STRINGS_LG, 'Optimus Chic' ],
-			'LG-P725':									[ STRINGS_LG, 'Optimus 3D Max' ],
-			'LG-P7(60|69)!':							[ STRINGS_LG, 'Optimus L9' ],
-			'LG-P860':									[ STRINGS_LG, 'P860' ],
-			'LG-P870!':									[ STRINGS_LG, 'Escape' ],	
-			'LG-P880!':									[ STRINGS_LG, 'Optimus 4X HD' ],
-			'LG-P895':									[ STRINGS_LG, 'Optimus Vu' ],	
-			'LG-P920!':									[ STRINGS_LG, 'Optimus 3D' ],
-			'LG-P925!':									[ STRINGS_LG, 'Thrill' ],
-			'LG-P930':									[ STRINGS_LG, 'Nitro HD' ],
-			'LG-P9(35|36)!':							[ STRINGS_LG, 'Optimus LTE' ],
-			'LG-P940':									[ STRINGS_LG, 'PRADA 3.0' ],
-			'LG-P970!':									[ STRINGS_LG, 'Optimus Black' ],
-			'LG-P990!':									[ STRINGS_LG, 'Optimus 2X Speed' ],
-			'LG-P993':									[ STRINGS_LG, 'Optimus 2X' ],
-			'LG-SU540':									[ STRINGS_LG, 'PRADA 3.0' ],
-			'LG-SU640':									[ STRINGS_LG, 'Optimus LTE' ],
-			'LG-SU660':									[ STRINGS_LG, 'Optimus 2X' ],
-			'LG-SU760':									[ STRINGS_LG, 'Optimus 3D' ],
-			'LG-SU870':									[ STRINGS_LG, 'Optimus 3D Cube' ],
-			'LG-SU880':									[ STRINGS_LG, 'Optimus EX' ],
-			'LG-US670':									[ STRINGS_LG, 'Optimus U' ],
-			'LG-US730':									[ STRINGS_LG, 'Splendor' ],
-			'LG-V900':									[ STRINGS_LG, 'Optimus Pad', TYPE_TABLET ],
-			'LG-V9(05|09)!':							[ STRINGS_LG, 'Optimus G-Slate', TYPE_TABLET ],
-			'LG-VM670':									[ STRINGS_LG, 'Optimus V' ],
-			'LG-VM696':									[ STRINGS_LG, 'Optimus Elite' ],
-			'LG-VM701':									[ STRINGS_LG, 'Optimus Slider' ],
-			'LG-VS660':									[ STRINGS_LG, 'Vortex' ],
-			'LG-VS700':									[ STRINGS_LG, 'Enlighten' ],
-			'LG-VS740':									[ STRINGS_LG, 'Ally' ],
-			'LG-VS840':									[ STRINGS_LG, 'Lucid' ],
-			'LG-VS870':									[ STRINGS_LG, 'VS870' ],
-			'LG-VS910':									[ STRINGS_LG, 'Revolution' ],
-			'lgp-970':									[ STRINGS_LG, 'Optimus Black' ],
-			'AS740':									[ STRINGS_LG, 'Axis' ],
-			'E900':										[ STRINGS_LG, 'Optimus 7' ],
-			'GT540':									[ STRINGS_LG, 'Optimus GT540' ],
-			'GW620':									[ STRINGS_LG, 'Eve' ],
-			'KU9500':									[ STRINGS_LG, 'Optimus Z' ],
-			'LGC660':									[ STRINGS_LG, 'Optimus Pro' ],
-			'LGL45C':									[ STRINGS_LG, 'Optimus Net' ],
-			'LGL55C':									[ STRINGS_LG, 'Optimus Q' ],
-			'LU2300':									[ STRINGS_LG, 'Optimus Q' ],	
-			'LS670':									[ STRINGS_LG, 'Optimus S' ],
-			'P940':										[ STRINGS_LG, 'PRADA 3.0' ],
-			'P990':										[ STRINGS_LG, 'Optimus 2X Speed' ],
-			'USCC-US730':								[ STRINGS_LG, 'Splendor' ],
-			'USCC-US760':								[ STRINGS_LG, 'Genesis' ],
-			'VM670':									[ STRINGS_LG, 'Optimus V' ],
-			'VS840 4G':									[ STRINGS_LG, 'Lucid' ],
-			'VS870 4G':									[ STRINGS_LG, 'VS870' ],
-			'VS900-4G':									[ STRINGS_LG, 'Enlighten' ],
-			'VS910 4G':									[ STRINGS_LG, 'Revolution 4G' ],
-			'VS920 4G':									[ STRINGS_LG, 'Spectrum' ],
-			'VS930 4G':									[ STRINGS_LG, 'Spectrum 2' ],
-			'VS950 4G':									[ STRINGS_LG, 'Intuition' ],
-			'L-01D':									[ STRINGS_LG, 'Optimus LTE' ],
-			'L-01E':									[ STRINGS_LG, 'Optimus G' ],
-			'L-02D':									[ STRINGS_LG, 'PRADA phone' ],
-			'L-02E':									[ STRINGS_LG, 'Optimus LIFE' ],
-			'L-04C':									[ STRINGS_LG, 'Optimus Chat' ],
-			'L-05D':									[ STRINGS_LG, 'Optimus it' ],
-			'L-06C':									[ STRINGS_LG, 'Optimus Pad', TYPE_TABLET ],
-			'L-06D':									[ STRINGS_LG, 'Optimus Vu' ],
-			'L-07C':									[ STRINGS_LG, 'Optimus Bright' ],
-			'LG-Eve':									[ STRINGS_LG, 'Eve' ],
-			'LG-Optimus One P500':						[ STRINGS_LG, 'Optimus One' ],
-			'LG-Optimus 2X':							[ STRINGS_LG, 'Optimus 2X' ],
-			'LG-GT540 Optimus':							[ STRINGS_LG, 'Optimus' ],
-			'LG-Optimus Black':							[ STRINGS_LG, 'Optimus Black' ],
-			'Ally':										[ STRINGS_LG, 'Ally' ],
-			'Optimus':									[ STRINGS_LG, 'Optimus' ],
-			'Optimus Me':								[ STRINGS_LG, 'Optimus Me' ],
-			'optimus me p350':							[ STRINGS_LG, 'Optimus Me' ],
-			'Optimus 2X':								[ STRINGS_LG, 'Optimus 2X' ],
-			'Optimus 2x':								[ STRINGS_LG, 'Optimus 2X' ],
-			'IS11LG':									[ STRINGS_LG, 'Optimus X' ],
-			'Vortex':									[ STRINGS_LG, 'Vortex' ],
-			'LDK-ICK v1.4':								[ STRINGS_LG, 'Esteem' ],
-			'T6':										[ 'Malata', 'Zpad T6', TYPE_TABLET ],
-			'Malata SMBA1002':							[ 'Malata', 'Tablet SMB-A1002', TYPE_TABLET ],
-			'STM712HCZ':								[ 'Mediacom', 'SmartPad 712c', TYPE_TABLET ],
-			'STM803HC':									[ 'Mediacom', 'SmartPad 810c', TYPE_TABLET ],
-			'Mediacom 810C':							[ 'Mediacom', 'SmartPad 810c', TYPE_TABLET ],
-			'SmartPad810c':								[ 'Mediacom', 'SmartPad 810c', TYPE_TABLET ],
-			'MP810C':									[ 'Mediacom', 'SmartPad 810c', TYPE_TABLET ],
-			'MP907C':									[ 'Mediacom', 'SmartPad 907c', TYPE_TABLET ],
-			'MTK6516':									[ 'Mediatek', 'MTK6516' ],
-			'LIFETAB S9512':							[ 'Medion', 'Lifetab S9512', TYPE_TABLET ],
-			'LIFETAB P9514':							[ 'Medion', 'Lifetab P9514', TYPE_TABLET ],
-			'MD LIFETAB P9516':							[ 'Medion', 'Lifetab P9516', TYPE_TABLET ],
-			'MEDION LIFE P4012':						[ 'Medion', 'Life P4012' ],
-			'MEDION LIFE P4310':						[ 'Medion', 'Life P4310' ],
-			'M8':										[ 'Meizu', 'M8' ],
-			'M9':										[ 'Meizu', 'M9' ],
-			'M9-unlocked':								[ 'Meizu', 'M9' ],
-			'MEIZU M9':									[ 'Meizu', 'M9' ],
-			'MEIZU MX':									[ 'Meizu', 'MX' ],
-			'M030':										[ 'Meizu', 'MX M030' ],
-			'M031':										[ 'Meizu', 'MX M031' ],
-			'M032':										[ 'Meizu', 'MX M032' ],
-			'Slidepad':									[ 'Memup', 'Slidepad', TYPE_TABLET ],
-			'Micromax A44':								[ 'Micromax', 'A44 Punk' ],
-			'A45':										[ 'Micromax', 'A45 Punk' ],
-			'Micromax A50':								[ 'Micromax', 'A50 Ninja' ],
-			'Micromax A52':								[ 'Micromax', 'A52 Aisha' ],
-			'Micromax A56':								[ 'Micromax', 'A56 Ninja 2' ],
-			'Micromax A57':								[ 'Micromax', 'A57 Ninja 3' ],
-			'Micromax A60':								[ 'Micromax', 'Andro A60' ],
-			'Micromax A70':								[ 'Micromax', 'Andro A70' ],
-			'Micromax A73':								[ 'Micromax', 'A73 Buzz' ],
-			'Micromax A75':								[ 'Micromax', 'A75 Lite' ],
-			'Micromax A78':								[ 'Micromax', 'A78 Gossip' ],
-			'Micromax A80':								[ 'Micromax', 'A80 Infinity' ],
-			'Micromax A84':								[ 'Micromax', 'A84' ],
-			'Micromax A85':								[ 'Micromax', 'A85' ],
-			'Micromax A87':								[ 'Micromax', 'A87 Ninja 4' ],
-			'Micromax A90':								[ 'Micromax', 'A90 Pixel' ],
-			'Micromax A100':							[ 'Micromax', 'A100 Canvas' ],
-			'Micromax A110':							[ 'Micromax', 'A110 Canvas 2' ],
-			'Micromax P275':							[ 'Micromax', 'Funbook Infinity P275', TYPE_TABLET ],
-			'P300(Funbook)':							[ 'Micromax', 'Funbook P300', TYPE_TABLET ],
-			'Micromax P500(Funbook)':					[ 'Micromax', 'Funbook Pro P500', TYPE_TABLET ],
-			'AT735':									[ 'Moinstone', 'AT735', TYPE_TABLET ],
-			'A853':										[ STRINGS_MOTOROLA, 'Milestone' ],
-			'A953':										[ STRINGS_MOTOROLA, 'Milestone 2' ],
-			'A1680':									[ STRINGS_MOTOROLA, 'MOTO A1680' ],
-			'ET1':										[ STRINGS_MOTOROLA, 'ET1 Enterprise Tablet', TYPE_TABLET ],
-			'MB200':									[ STRINGS_MOTOROLA, 'CLIQ' ],
-			'MB300':									[ STRINGS_MOTOROLA, 'BACKFLIP' ],
-			'MB501':									[ STRINGS_MOTOROLA, 'CLIQ XT' ],
-			'MB502':									[ STRINGS_MOTOROLA, 'CHARM' ],
-			'MB508':									[ STRINGS_MOTOROLA, 'FLIPSIDE' ],
-			'MB511':									[ STRINGS_MOTOROLA, 'FLIPOUT' ],
-			'MB520':									[ STRINGS_MOTOROLA, 'BRAVO' ],
-			'MB525!':									[ STRINGS_MOTOROLA, 'DEFY' ],
-			'MB526':									[ STRINGS_MOTOROLA, 'DEFY+' ],
-			'MB611':									[ STRINGS_MOTOROLA, 'CLIQ 2' ],
-			'MB612':									[ STRINGS_MOTOROLA, 'XPRT' ],
-			'MB632':									[ STRINGS_MOTOROLA, 'PRO+' ],
-			'MB855':									[ STRINGS_MOTOROLA, 'PHOTON 4G' ],
-			'MB8(60|61)!':								[ STRINGS_MOTOROLA, 'ATRIX' ],
-			'MB865':									[ STRINGS_MOTOROLA, 'ATRIX 2' ],
-			'MB870':									[ STRINGS_MOTOROLA, 'Droid X2' ],
-			'MB886':									[ STRINGS_MOTOROLA, 'DINARA' ],
-			'ME501':									[ STRINGS_MOTOROLA, 'CLIQ XT' ],
-			'ME511':									[ STRINGS_MOTOROLA, 'FLIPOUT' ],
-			'ME525!':									[ STRINGS_MOTOROLA, 'MOTO ME525' ],
-			'ME600':									[ STRINGS_MOTOROLA, 'BACKFLIP' ],
-			'ME632':									[ STRINGS_MOTOROLA, 'PRO+' ],
-			'ME722':									[ STRINGS_MOTOROLA, 'Milestone 2' ],
-			'ME811':									[ STRINGS_MOTOROLA, 'Droid X' ],
-			'ME860':									[ STRINGS_MOTOROLA, 'ATRIX' ],
-			'ME863':									[ STRINGS_MOTOROLA, 'Milestone 3' ],
-			'ME865':									[ STRINGS_MOTOROLA, 'ATRIX 2' ],
-			'MT620!':									[ STRINGS_MOTOROLA, 'MOTO MT620' ],
-			'MT716':									[ STRINGS_MOTOROLA, 'MOTO MT716' ],
-			'MT810':									[ STRINGS_MOTOROLA, 'MOTO MT810' ],
-			'MT870':									[ STRINGS_MOTOROLA, 'MOTO MT870' ],
-			'MT917':									[ STRINGS_MOTOROLA, 'MT917' ],
-			'MZ505':									[ STRINGS_MOTOROLA, 'XOOM Family Edition', TYPE_TABLET ],
-			'MZ600':									[ STRINGS_MOTOROLA, 'XOOM 4G LTE', TYPE_TABLET ],
-			'MZ601':									[ STRINGS_MOTOROLA, 'XOOM 3G', TYPE_TABLET ],
-			'MZ602':									[ STRINGS_MOTOROLA, 'XOOM 4G LTE', TYPE_TABLET ],
-			'MZ603':									[ STRINGS_MOTOROLA, 'XOOM 3G', TYPE_TABLET ],
-			'MZ604':									[ STRINGS_MOTOROLA, 'XOOM WiFi', TYPE_TABLET ],
-			'MZ605':									[ STRINGS_MOTOROLA, 'XOOM 3G', TYPE_TABLET ],
-			'MZ606':									[ STRINGS_MOTOROLA, 'XOOM WiFi', TYPE_TABLET ],
-			'MZ607':									[ STRINGS_MOTOROLA, 'XOOM 2 WiFi Media Edition', TYPE_TABLET ],
-			'MZ609!':									[ STRINGS_MOTOROLA, 'Droid XYBOARD 8.2', TYPE_TABLET ],
-			'MZ615':									[ STRINGS_MOTOROLA, 'XOOM 2 WiFi', TYPE_TABLET ],
-			'MZ617!':									[ STRINGS_MOTOROLA, 'Droid XYBOARD 10.1', TYPE_TABLET ],
-			'WX435':									[ STRINGS_MOTOROLA, 'TRIUMPH WX435' ],
-			'WX445':									[ STRINGS_MOTOROLA, 'CITRUS WX445' ],
-			'XT300':									[ STRINGS_MOTOROLA, 'SPICE' ],
-			'XT301':									[ STRINGS_MOTOROLA, 'MOTO XT301' ],
-			'XT311':									[ STRINGS_MOTOROLA, 'FIRE' ],
-			'XT316':									[ STRINGS_MOTOROLA, 'MOTO XT316' ],
-			'XT319':									[ STRINGS_MOTOROLA, 'MOTO XT319' ],
-			'XT3(20|21)!':								[ STRINGS_MOTOROLA, 'DEFY Mini' ],
-			'XT390':									[ STRINGS_MOTOROLA, 'MOTOSMART XT390' ],
-			'XT500':									[ STRINGS_MOTOROLA, 'MOTO XT500' ],
-			'xt-500':									[ STRINGS_MOTOROLA, 'MOTO XT500' ],
-			'XT502':									[ STRINGS_MOTOROLA, 'QUENCH XT5' ],
-			'XT5(30|31)!':								[ STRINGS_MOTOROLA, 'FIRE XT' ],
-			'XT532':									[ STRINGS_MOTOROLA, 'MOTO XT532' ],	
-			'XT535':									[ STRINGS_MOTOROLA, 'DEFY' ],	
-			'XT536':									[ STRINGS_MOTOROLA, 'DEFY Diana' ],	
-			'XT550':									[ STRINGS_MOTOROLA, 'MOTOSMART MIX' ],	
-			'XT5(56|57)!':								[ STRINGS_MOTOROLA, 'DEFY XT' ],	
-			'XT603':									[ STRINGS_MOTOROLA, 'ADMIRAL' ],
-			'XT605':									[ STRINGS_MOTOROLA, 'XT605' ],	
-			'XT610':									[ STRINGS_MOTOROLA, 'Droid Pro' ],
-			'XT615':									[ STRINGS_MOTOROLA, 'MOTO XT615' ],
-			'XT626':									[ STRINGS_MOTOROLA, 'MOTO XT626' ],
-			'XT681':									[ STRINGS_MOTOROLA, 'MOTO XT681' ],
-			'XT682':									[ STRINGS_MOTOROLA, 'Droid 3' ],
-			'XT685':									[ STRINGS_MOTOROLA, 'MOTO XT685' ],
-			'XT687':									[ STRINGS_MOTOROLA, 'ATRIX TV' ],
-			'XT701':									[ STRINGS_MOTOROLA, 'XT701' ],
-			'XT702':									[ STRINGS_MOTOROLA, 'MOTO XT702' ],
-			'XT711':									[ STRINGS_MOTOROLA, 'MOTO XT711' ],
-			'XT720':									[ STRINGS_MOTOROLA, 'Milestone' ],
-			'XT788':									[ STRINGS_MOTOROLA, 'XT788' ],
-			'XT875':									[ STRINGS_MOTOROLA, 'Droid Bionic' ],
-			'XT800W':									[ STRINGS_MOTOROLA, 'MOTO Glam' ],
-			'XT800!':									[ STRINGS_MOTOROLA, 'MOTO XT800' ],
-			'XT806':									[ STRINGS_MOTOROLA, 'MOTO XT806' ],
-			'XT8(60|83)!':								[ STRINGS_MOTOROLA, 'Milestone 3' ],
-			'XT862':									[ STRINGS_MOTOROLA, 'Droid 3' ],
-			'XT881':									[ STRINGS_MOTOROLA, 'Electrify 2' ],
-			'XT882':									[ STRINGS_MOTOROLA, 'MOTO XT882' ],
-			'XT8(85|86)!':								[ STRINGS_MOTOROLA, 'RAZR V' ],
-			'XT889':									[ STRINGS_MOTOROLA, 'XT889' ],
-			'XT890':									[ STRINGS_MOTOROLA, 'RAZR i' ],
-			'XT8(94|97)!':								[ STRINGS_MOTOROLA, 'Droid 4' ],
-			'XT9(01|10)!':								[ STRINGS_MOTOROLA, 'RAZR' ],
-			'XT907':									[ STRINGS_MOTOROLA, 'Droid RAZR M' ],
-			'XT912!':									[ STRINGS_MOTOROLA, 'Droid RAZR' ],
-			'XT9(23|25|26)!':							[ STRINGS_MOTOROLA, 'Droid RAZR HD' ],
-			'XT928':									[ STRINGS_MOTOROLA, 'XT928' ],
-			'201M':										[ STRINGS_MOTOROLA, 'Droid RAZR M' ],
-			'Atrix 2':									[ STRINGS_MOTOROLA, 'ATRIX 2' ],
-			'Atrix 4G':									[ STRINGS_MOTOROLA, 'ATRIX 4G' ],
-			'Atrix 4G ME860':							[ STRINGS_MOTOROLA, 'ATRIX 4G' ],
-			'CLIQ':										[ STRINGS_MOTOROLA, 'CLIQ' ],
-			'CLIQ XT':									[ STRINGS_MOTOROLA, 'CLIQ XT' ],
-			'CLIQ2':									[ STRINGS_MOTOROLA, 'CLIQ 2' ],
-			'Corvair':									[ STRINGS_MOTOROLA, 'Corvair', TYPE_TABLET ],
-			'DEFY':										[ STRINGS_MOTOROLA, 'DEFY' ],
-			'Defy(\\+| Plus)!':							[ STRINGS_MOTOROLA, 'DEFY+' ],
-			'Dext':										[ STRINGS_MOTOROLA, 'Dext' ],
-			'Droid':									[ STRINGS_MOTOROLA, 'Droid' ],
-			'DROID':									[ STRINGS_MOTOROLA, 'Droid' ],
-			'DROID ?2!':								[ STRINGS_MOTOROLA, 'Droid 2' ],
-			'DROID ?3!':								[ STRINGS_MOTOROLA, 'Droid 3' ],
-			'DROID ?4!':								[ STRINGS_MOTOROLA, 'Droid 4' ],
-			'DROID BIONIC!':							[ STRINGS_MOTOROLA, 'Droid Bionic' ],
-			'DROID RAZR HD!':							[ STRINGS_MOTOROLA, 'Droid RAZR HD' ],
-			'DROID ?RAZR!':								[ STRINGS_MOTOROLA, 'Droid RAZR' ],
-			'DROID SPYDER':								[ STRINGS_MOTOROLA, 'Droid RAZR' ],
-			'DROID ?X2!':								[ STRINGS_MOTOROLA, 'Droid X2' ],
-			'DROID ?X!':								[ STRINGS_MOTOROLA, 'Droid X' ],
-			'Devour':									[ STRINGS_MOTOROLA, 'Droid Devour' ],
-			'calgary':									[ STRINGS_MOTOROLA, 'Droid Devour' ],
-			'Electrify':								[ STRINGS_MOTOROLA, 'Electrify' ],
-			'Milestone XT720':							[ STRINGS_MOTOROLA, 'Milestone' ],
-			'Milestone':								[ STRINGS_MOTOROLA, 'Milestone' ],
-			'A853 Milestone':							[ STRINGS_MOTOROLA, 'Milestone' ],
-			'Milestone X':								[ STRINGS_MOTOROLA, 'Milestone X' ],
-			'Milestone X2':								[ STRINGS_MOTOROLA, 'Milestone X2' ],
-			'MotoroiX':									[ STRINGS_MOTOROLA, 'Droid X' ],
-			'Moto Backflip':							[ STRINGS_MOTOROLA, 'BACKFLIP' ],
-			'RAZR':										[ STRINGS_MOTOROLA, 'RAZR' ],
-			'Triumph':									[ STRINGS_MOTOROLA, 'TRIUMPH' ],
-			'Opus One':									[ STRINGS_MOTOROLA, 'i1' ],
-			'Photon':									[ STRINGS_MOTOROLA, 'PHOTON' ],
-			'Photon 4G':								[ STRINGS_MOTOROLA, 'PHOTON 4G' ],
-			'XOOM':										[ STRINGS_MOTOROLA, 'XOOM', TYPE_TABLET ],
-			'XOOM 2!':									[ STRINGS_MOTOROLA, 'XOOM 2', TYPE_TABLET ],
-			'XOOM MZ606':								[ STRINGS_MOTOROLA, 'XOOM WiFi', TYPE_TABLET ],
-			'ISW11M':									[ STRINGS_MOTOROLA, 'PHOTON' ],
-			'IS12M':									[ STRINGS_MOTOROLA, 'RAZR' ],
-			'MOTWX435KT':								[ STRINGS_MOTOROLA, 'TRIUMPH' ],
-			'X3-Ice MIUI XT720 Memorila Classics':		[ STRINGS_MOTOROLA, 'Milestone' ],
-			'NABI-A':									[ 'Nabi', 'Kids tablet', TYPE_TABLET ],
-			'Newpad':									[ 'Newsmy', 'Newpad', TYPE_TABLET ],
-			'Newpad-K97':								[ 'Newsmy', 'Newpad K97', TYPE_TABLET ],
-			'Newpad P9':								[ 'Newsmy', 'Newpad P9', TYPE_TABLET ],
-			'M-PAD N8':									[ 'Newsmy', 'M-pad N8', TYPE_TABLET ],
-			'LT-NA7':									[ 'NEC', 'LT-NA7' ],
-			'N-01D':									[ 'NEC', 'MEDIAS PP N-01D' ],
-			'N-04C':									[ 'NEC', 'MEDIAS N-04C' ],
-			'N-04D':									[ 'NEC', 'MEDIAS LTE N-04D' ],
-			'N-05D':									[ 'NEC', 'MEDIAS ES N-05D' ],
-			'N-06C':									[ 'NEC', 'MEDIAS WP N-06C' ],
-			'N-06D':									[ 'NEC', 'MEDIAS Tab N-06D', TYPE_TABLET ],
-			'N-07D':									[ 'NEC', 'MEDIAS X N-07D' ],
-			'101N':										[ 'NEC', 'MEDIAS CH Softbank 101N' ],
-			'IS11N':									[ 'NEC', 'MEDIAS BR IS11N' ],
-			'Nexian NX-A890':							[ 'Nexian', 'Journey' ],
-			'NX-A891':									[ 'Nexian', 'Ultra Journey' ],
-			'M726HC':									[ 'Nextbook', 'Premium 7', TYPE_EREADER ],
-			'Next7P12':									[ 'Nextbook', 'Premium 7', TYPE_EREADER ],
-			'NXM726HN':									[ 'Nextbook', 'Premium 7', TYPE_EREADER ],
-			'NXM727KC!':								[ 'Nextbook', 'Premium 7', TYPE_EREADER ],
-			'NXM803HD':									[ 'Nextbook', 'Premium 8', TYPE_EREADER ],
-			'DATAM803HC':								[ 'Nextbook', 'Premium 8', TYPE_EREADER ],
-			'NXM901':									[ 'Nextbook', 'Next 3', TYPE_EREADER],
-			'NGM Vanity Smart':							[ 'NGM', 'Vanity Smart' ],
-			'Nokia N9':									[ 'Nokia', 'N9' ],
-			'Nokia N900':								[ 'Nokia', 'N900' ],
-			'Lumia800':									[ 'Nokia', 'Lumia 800' ],
-			'Lumia 900':								[ 'Nokia', 'Lumia 900' ],
-			'Notion Ink ADAM':							[ 'Notion Ink', 'ADAM', TYPE_TABLET ],
-			'Adam':										[ 'Notion Ink', 'ADAM', TYPE_TABLET ],
-			'P4D Sirius':								[ 'Nvsbl', 'P4D SIRIUS', TYPE_TABLET ],
-			'EFM710A':									[ 'Oblio', 'Mint 7x', TYPE_TABLET ],
-			'ODYS-Xpress':								[ 'Odys', 'Xpress', TYPE_TABLET ],
-			'Olivetti Olipad 100':						[ 'Olivetti', 'Olipad 100', TYPE_TABLET ],
-			'OP110':									[ 'Olivetti', 'Olipad 110', TYPE_TABLET ],
-			'ONDA MID':									[ 'Onda', 'MID', TYPE_TABLET ],
-			'VX580A':									[ 'Onda', 'VX580A', TYPE_TABLET ],
-			'VX610A':									[ 'Onda', 'VX610A', TYPE_TABLET ],
-			'TQ150':									[ 'Onda', 'TQ150' ],
-			'N2T':										[ 'ONN', 'N2T', TYPE_TABLET ],
-			'Renesas!':									[ 'Opad', 'Renesas', TYPE_TABLET ],
-			'X903':										[ 'Oppo', 'Find Me X903' ],
-			'X905':										[ 'Oppo', 'Find 3 X905' ],
-			'OPPOX905':									[ 'Oppo', 'Find 3 X905' ],
-			'X907':										[ 'Oppo', 'Finder X907' ],
-			'OPPOX907':									[ 'Oppo', 'Finder X907' ],
-			'X9015':									[ 'Oppo', 'Find X9015' ],
-			'OPPOX9015':								[ 'Oppo', 'Find X9015' ],
-			'OPPOX9017':								[ 'Oppo', 'Finder X9017' ],
-			'R801':										[ 'Oppo', 'Real R801' ],
-			'OPPOR801':									[ 'Oppo', 'Real R801' ],
-			'OPPOR805':									[ 'Oppo', 'Real R805' ],
-			'OPPOR807':									[ 'Oppo', 'Real R807' ],
-			'OPPOR817':									[ 'Oppo', 'Real R817' ],
-			'OPPOT29':									[ 'Oppo', 'T29' ],
-			'OPPOT703':									[ 'Oppo', 'T703' ],
-			'OPPOU701':									[ 'Oppo', 'Ulike U701' ],
-			'OPPOU7011':								[ 'Oppo', 'Find Gemini U7011' ],
-			'P-01D':									[ 'Panasonic', 'P-01D' ],
-			'P-02D':									[ 'Panasonic', 'Lumix Phone' ],
-			'P-04D':									[ 'Panasonic', 'Eluga' ],
-			'P-06D':									[ 'Panasonic', 'Eluga V' ],
-			'P-07C':									[ 'Panasonic', 'P-07C' ],
-			'dL1':										[ 'Panasonic', 'Eluga dL1' ],
-			'101P':										[ 'Panasonic', 'Lumix Phone' ],
-			'JT-H580VT':								[ 'Panasonic', 'BizPad 7', TYPE_TABLET ],
-			'JT-H581VT':								[ 'Panasonic', 'BizPad 10', TYPE_TABLET ],
-			'FZ-A1A':									[ 'Panasonic', 'Toughpad', TYPE_TABLET ],
-			'pandigital9hr':							[ 'Pandigital', '9HR', TYPE_TABLET ],
-			'pandigital9hr2':							[ 'Pandigital', '9HR2', TYPE_TABLET ],
-			'pandigitalopc1':							[ 'Pandigital', 'OPC1', TYPE_TABLET ],
-			'pandigitalopp1':							[ 'Pandigital', 'OPP1', TYPE_TABLET ],
-			'pandigitalp1hr':							[ 'Pandigital', 'p1hr', TYPE_TABLET ],
-			'IM-A600!':									[ STRINGS_PANTECH, 'SIRIUS α' ],
-			'IM-A630!':									[ STRINGS_PANTECH, 'Izar' ],
-			'IM-A650!':									[ STRINGS_PANTECH, 'Vega' ],
-			'IM-A690!':									[ STRINGS_PANTECH, 'Mirach' ],
-			'IM-A7(10|20)!':							[ STRINGS_PANTECH, 'VegaXpress' ],
-			'IM-A725!':									[ STRINGS_PANTECH, 'Vega X+' ],
-			'IM-A730!':									[ STRINGS_PANTECH, 'Vega S' ],
-			'IM-A7(40|50)!':							[ STRINGS_PANTECH, 'Mirach A' ],
-			'IM-A7(60|70|75|80)!':						[ STRINGS_PANTECH, 'Vega Racer' ],
-			'IM-A800!':									[ STRINGS_PANTECH, 'Vega LTE' ],
-			'IM-A810!':									[ STRINGS_PANTECH, 'Vega LTE M' ],
-			'IM-A820!':									[ STRINGS_PANTECH, 'Vega LTE EX' ],
-			'IM-A830!':									[ STRINGS_PANTECH, 'Vega Racer 2' ],
-			'IM-A840!':									[ STRINGS_PANTECH, 'Vega S5' ],
-			'IM-A850!':									[ STRINGS_PANTECH, 'Vega R3' ],
-			'IM-T100K':									[ STRINGS_PANTECH, 'Vega N˚ 5', TYPE_TABLET ],
-			'IS06':										[ STRINGS_PANTECH, 'SIRIUS α' ],
-			'ADR8995!':									[ STRINGS_PANTECH, 'Breakout' ],
-			'ADR910L 4G':								[ STRINGS_PANTECH, 'Marauder' ],
-			'ADR930L 4G':								[ STRINGS_PANTECH, 'ADR930L' ],
-			'PantechP4100':								[ STRINGS_PANTECH, 'Element', TYPE_TABLET ],
-			'PantechP8000':								[ STRINGS_PANTECH, 'Crossover' ],
-			'PantechP8010':								[ STRINGS_PANTECH, 'Flex' ],
-			'PantechP9060':								[ STRINGS_PANTECH, 'Pocket' ],
-			'PantechP9070':								[ STRINGS_PANTECH, 'Burst' ],
-			'PantechP9090':								[ STRINGS_PANTECH, 'Magnus' ],
-			'SKY IM-A600S':								[ STRINGS_PANTECH, 'SIRIUS α' ],
-			'SKY IM-A630K':								[ STRINGS_PANTECH, 'Izar' ],
-			'SKY IM-A650S':								[ STRINGS_PANTECH, 'Vega' ],
-			'IS11PT':									[ STRINGS_PANTECH, 'Mirach IS11PT' ],
-			'PAT712W':									[ 'Perfeo', 'PAT712W', TYPE_TABLET ],
-			'X7G':										[ 'Pearl', 'Touchlet X7G', TYPE_TABLET ],
-			'FWS810':									[ 'PHICOMM', 'FWS810' ],
-			'Philips PI5000':							[ 'Philips', 'PI5000', TYPE_TABLET ],
-			'PI7000':									[ 'Philips', 'PI7000', TYPE_TABLET ],
-			'Philips W626':								[ 'Philips', 'W626' ],
-			'Philips W632':								[ 'Philips', 'W632' ],
-			'MOMO':										[ 'Ployer', 'MOMO', TYPE_TABLET ],
-			'MOMO7':									[ 'Ployer', 'MOMO7', TYPE_TABLET ],
-			'MOMO8':									[ 'Ployer', 'MOMO8', TYPE_TABLET ],
-			'MOMO9':									[ 'Ployer', 'MOMO9', TYPE_TABLET ],
-			'MOMO15':									[ 'Ployer', 'MOMO15', TYPE_TABLET ],
-			'PocketBook A7':							[ 'PocketBook', 'A7', TYPE_TABLET ],
-			'PocketBook A10':							[ 'PocketBook', 'A10', TYPE_TABLET ],
-			'Mobii 7':									[ 'Point Of View', 'Mobii 7', TYPE_TABLET ],
-			'PMID4311':									[ 'Polaroid', 'PMID 4311', TYPE_TABLET ],
-			'PMP3384BRU':								[ 'Prestigio', 'Multipad 3384', TYPE_TABLET ],
-			'TB07FTA':									[ 'Positivo', 'TB07FTA', TYPE_TABLET ],
-			'QW TB-1207':								[ 'Qware', 'Pro3', TYPE_TABLET ],
-			'W6HD ICS':									[ 'Ramos', 'W6HD', TYPE_TABLET ],
-			'W10':										[ 'Ramos', 'W10', TYPE_TABLET ],
-			'W10 V2.0':									[ 'Ramos', 'W10 v2.0', TYPE_TABLET ],
-			'W22PRO':									[ 'Ramos', 'W22 Pro', TYPE_TABLET ],
-			'T11AD!':									[ 'Ramos', 'T11AD', TYPE_TABLET ],
-			'Rikomagic MK802':							[ 'Rikomagic', 'MK802', TYPE_TELEVISION ],
-			'PlayBook':									[ 'RIM', 'BlackBerry PlayBook', TYPE_TABLET ],
-			'RBK-490':									[ 'Ritmix', 'RBK-490', TYPE_TABLET ],
-			'A8HD':										[ 'Saayi', 'Dropad A8HD', TYPE_TABLET ],
-			'GT-B5330!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Chat' ],
-			'GT-B5510!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y Pro' ],
-			'GT-B5512!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y Pro Duos' ],
-			'GT-B7510!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Pro' ],
-			'GT-B9062':									[ STRINGS_SAMSUNG, 'GT-B9062' ],
-			'GT-I55(00|03|08)!':						[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' 5' ],
-			'GT-I5510!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' 551' ],
-			'GT-I5700!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Spica' ],
-			'GT-I58(00|01)!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Apollo' ],
-			'GT-I6500!':								[ STRINGS_SAMSUNG, 'Saturn' ],
-			'GT-I777!':									[ STRINGS_SAMSUNG, 'Singa' ],
-			'GT-I8000!':								[ STRINGS_SAMSUNG, 'Omnia 2' ],
-			'GT-I8150!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' W' ],
-			'GT-I8160!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace 2' ],
-			'GT-I8190!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III Mini' ],
-			'GT-I8250!':								[ STRINGS_SAMSUNG, 'GT-I8250' ],
-			'GT-I8320!':								[ STRINGS_SAMSUNG, 'H1' ],
-			'GT-I85(20|30)!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Beam' ],
-			'GT-I90(00|08|88)!':						[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
-			'GT-I9001!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Plus' ],
-			'GT-I9003!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' SL' ],
-			'GT-I9010!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Giorgio Armani' ],
-			'GT-I9018!':								[ STRINGS_SAMSUNG, 'GT-I9018' ],
-			'GT-I9050!':								[ STRINGS_SAMSUNG, 'GT-I9050' ],
-			'GT-I9070!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Advance' ],
-			'GT-I91(00|08)!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
-			'GT-I9103!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' R' ],
-			'GT-I9210!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II LTE' ],
-			'GT-I92(20|28)!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
-			'GT-I9250!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
-			'GT-I93(00|03|05|08)!':						[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
-			'GT-I9500!':								[ STRINGS_SAMSUNG, 'GT-I9500' ],
-			'GT-I9800!':								[ STRINGS_SAMSUNG, 'GT-I9800' ],
-			'GT-N70(00|05)!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
-			'GT-N71(00|05)!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note II' ],
-			'GT-N80(00|05|10|13)!':						[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note 10.1' ],
-			'GT-P10(00|10)!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', TYPE_TABLET ],
-			'GT-P31(00|10|13)!':						[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 2 (7.0)', TYPE_TABLET ],
-			'GT-P51(00|10|13)!':						[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 2 (10.1)', TYPE_TABLET ],
-			'GT-P62(00|10)!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.0 Plus', TYPE_TABLET ],
-			'GT-P62(01|11)!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.0 Plus N', TYPE_TABLET ],
-			'GT-P68(00|10)!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.7', TYPE_TABLET ],
-			'GT-P7100!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1V', TYPE_TABLET ],
-			'GT-P73(00|10|20)!':						[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 8.9', TYPE_TABLET ],
-			'GT-P75(00|10)!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1', TYPE_TABLET ],
-			'GT-P75(01|11)!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1N', TYPE_TABLET ],
-			'GT-S5300!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Pocket' ],
-			'GT-S5302!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Pocket Duos' ],
-			'GT-S53(60|63|69)!':						[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y' ],
-			'GT-S5367!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y TV' ],
-			'GT-S5368!':								[ STRINGS_SAMSUNG, 'GT-S5368' ],
-			'GT-S55(70|78)!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Mini' ],
-			'GT-S5660!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Gio' ],
-			'GT-S5670!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Fit' ],
-			'GT-S5690!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Xcover' ],
-			'GT-S58(20|30|38|39)!':						[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace' ],
-			'GT-S6102!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y Duos' ],
-			'GT-S6352':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace Duos' ],
-			'GT-S6358':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace' ],
-			'GT-S6500!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Mini 2' ],
-			'GT-S6702!':								[ STRINGS_SAMSUNG, 'GT-S6702' ],
-			'GT-S6802!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace Duos' ],
-			'GT-S7500!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace Plus' ],
-			'GT-S7562!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Duos' ],
-			'GT-T959!':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Vibrant' ],
-			'SCH-i509':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Y' ],
-			'SCH-i559':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Pop' ],
-			'SCH-i569':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Gio' ],
-			'SCH-i579':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace' ],
-			'SCH-i589':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace Duos' ],
-			'SCH-i705!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 2 (7.0)', TYPE_TABLET ],
-			'SCH-i809':									[ STRINGS_SAMSUNG, 'SCH-i809' ],
-			'SCH-i889':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
-			'SCH-i909':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
-			'SCH-i919':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Duos' ],
-			'SCH-i929':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II Duos' ],
-			'SCH-I100':									[ STRINGS_SAMSUNG, 'Gem' ],
-			'SCH-I110':									[ STRINGS_SAMSUNG, 'Illusion' ],
-			'SCH-I200':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Stellar' ],
-			'SCH-I339':									[ STRINGS_SAMSUNG, 'SCH-I339' ],
-			'SCH-I400':									[ STRINGS_SAMSUNG, 'Continuum' ],
-			'SCH-I405( 4G)?$!':							[ STRINGS_SAMSUNG, 'Stratosphere' ],
-			'SCH-I405U':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Metrix' ],
-			'SCH-I500':									[ STRINGS_SAMSUNG, 'Fascinate' ],
-			'SCH-I510':									[ STRINGS_SAMSUNG, 'Stealth V' ],
-			'SCH-I510 4G':								[ STRINGS_SAMSUNG, 'Droid Charge' ],
-			'SCH-I515':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
-			'SCH-I535!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
-			'SCH-I605':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note II' ],
-			'SCH-I619':									[ STRINGS_SAMSUNG, 'SCH-I619' ],
-			'SCH-I779':									[ STRINGS_SAMSUNG, 'SCH-I779' ],
-			'SCH-I800':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.0', TYPE_TABLET ],
-			'SCH-I815!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.7', TYPE_TABLET ],
-			'SCH-I905!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1', TYPE_TABLET ],
-			'SCH-I909':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
-			'SCH-I915':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 2 (10.1)', TYPE_TABLET ],
-			'SCH-I939':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
-			'SCH-M828!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Precedent' ],
-			'SCH-N719':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note II' ],
-			'SCH-R530!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
-			'SCH-R680':									[ STRINGS_SAMSUNG, 'Repp' ],
-			'SCH-R720':									[ STRINGS_SAMSUNG, 'Admire' ],
-			'SCH-R730':									[ STRINGS_SAMSUNG, 'Transfix' ],
-			'SCH-R760':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
-			'SCH-R820':									[ STRINGS_SAMSUNG, 'Admire' ],
-			'SCH-R880':									[ STRINGS_SAMSUNG, 'Acclaim' ],
-			'SCH-R910':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Indulge 4G' ],
-			'SCH-R915':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Indulge' ],
-			'SCH-R920':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Attain 4G' ],
-			'SCH-R930':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Aviator' ],
-			'SCH-R940':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Lightray' ],
-			'SCH-S720C':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Proclaim' ],
-			'SCH-S735C':								[ STRINGS_SAMSUNG, 'SCH-S735' ],
-			'SCH-S950C':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Showcase' ],
-			'SCH-W899':									[ STRINGS_SAMSUNG, 'SCH-W899' ],
-			'SCH-W999':									[ STRINGS_SAMSUNG, 'SCH-W999' ],
-			'SGH-E258':									[ STRINGS_SAMSUNG, 'SGH-E258' ],
-			'SGH-I317!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note II' ],
-			'SGH-I547!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Rugby Pro' ],
-			'SGH-I717!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
-			'SGH-I727':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II Skyrocket' ],
-			'SGH-I727R':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
-			'SGH-I7(47|48)!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
-			'SGH-I757!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II Skyrocket HD' ],
-			'SGH-I9?777!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
-			'SGH-I8(96|97)!':							[ STRINGS_SAMSUNG, 'Captivate' ],
-			'SGH-I927!':								[ STRINGS_SAMSUNG, 'Captivate Glide' ],
-			'SGH-I957!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 8.9', TYPE_TABLET ],
-			'SGH-I987':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.0', TYPE_TABLET ],
-			'SGH-I997':									[ STRINGS_SAMSUNG, 'Infuse 4G' ],
-			'SGH-I997R':								[ STRINGS_SAMSUNG, 'Infuse 4G' ],
-			'SGH-I9000':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
-			'SGH-S730G':								[ STRINGS_SAMSUNG, 'SGH-S730' ],
-			'SGH-T499':									[ STRINGS_SAMSUNG, 'Dart' ],
-			'SGH-T499[VY]!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Mini' ],
-			'SGH-T589!':								[ STRINGS_SAMSUNG, 'Gravity Smart' ],
-			'SGH-T679!':								[ STRINGS_SAMSUNG, 'Exhibit II 4G' ],
-			'SGH-T699':									[ STRINGS_SAMSUNG, 'S Blaze Q' ],
-			'SGH-T759':									[ STRINGS_SAMSUNG, 'Exhibit 4G' ],
-			'SGH-T769':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Blaze 4G' ],
-			'SGH-T839':									[ STRINGS_SAMSUNG, 'T-Mobile Sidekick' ],
-			'SGH-T849':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.0', TYPE_TABLET ],
-			'SGH-T859':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1', TYPE_TABLET ],
-			'SGH-T869':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.0 Plus', TYPE_TABLET ],
-			'SGH-T879':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
-			'SGH-T889':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note II' ],
-			'SGH-T959':									[ STRINGS_SAMSUNG, 'Vibrant' ],
-			'SGH-T959D':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Fascinate 3G+' ],
-			'SGH-T959P':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Fascinate 4G' ],
-			'SGH-T959V':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S 4G' ],
-			'SGH-T989':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
-			'SGH-T989D':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II X' ],
-			'SGH-T999!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Blaze 4G' ],
-			'SHV-E120!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II HD LTE' ],
-			'SHV-E110!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II LTE' ],
-			'SHV-E140!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 8.9', TYPE_TABLET ],
-			'SHV-E150!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.7', TYPE_TABLET ],
-			'SHV-E160!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
-			'SHV-E170!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' R' ],
-			'SHV-E210!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
-			'SHV-E250!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note II' ],
-			'SHW-M100!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' A' ],
-			'SHW-M110!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
-			'SHW-M130L!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' U' ],
-			'SHW-M130K!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' K' ],
-			'SHW-M1(80|85)!':							[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', TYPE_TABLET ],
-			'SHW-M190!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Hoppin' ],
-			'SHW-M220!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Neo' ],
-			'SHW-M240!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Ace' ],
-			'SHW ?-M250!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
-			'SHW-M300!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1', TYPE_TABLET ],
-			'SHW-M305!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 8.9', TYPE_TABLET ],
-			'SHW-M340!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' M Style' ],
-			'SHW-M380!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1', TYPE_TABLET ],
-			'SHW-M440!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
-			'SHW-M480!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note 10.1' ],
-			'SMT-i9100':								[ STRINGS_SAMSUNG, 'SMT-I9100', TYPE_TABLET ],
-			'SPH-D600':									[ STRINGS_SAMSUNG, 'Conquer 4G' ],
-			'SPH-D700':									[ STRINGS_SAMSUNG, 'Epic 4G' ],
-			'SPH-D705':									[ STRINGS_SAMSUNG, 'Epic 4G 2' ],
-			'SPH-D710!':								[ STRINGS_SAMSUNG, 'Epic 4G Touch' ],
-			'SPH-L700':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
-			'SPH-L710':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
-			'SPH-L900':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note II' ],
-			'SPH-M820!':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Prevail' ],
-			'SPH-M580':									[ STRINGS_SAMSUNG, 'Replenish' ],
-			'SPH-M900':									[ STRINGS_SAMSUNG, 'Moment' ],
-			'SPH-M910':									[ STRINGS_SAMSUNG, 'Intercept' ],
-			'SPH-M920':									[ STRINGS_SAMSUNG, 'Transform' ],
-			'SPH-M930!':								[ STRINGS_SAMSUNG, 'Transform Ultra' ],
-			'SPH-M950':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Reverb' ],
-			'SPH-P100':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', TYPE_TABLET ],
-			'YP-GB1':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Player', 'media' ],
-			'YP-GB70':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Player 70', 'media' ],
-			'YP-GB70D':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Player 70 Plus', 'media' ],
-			'YP-GS1':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S WiFi 3.6', 'media' ],
-			'YP-G1':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S WiFi 4.0', 'media' ],
-			'YP-GI1':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S WiFi 4.2', 'media' ],
-			'YP-G50':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Player', 'media' ],
-			'YP-G70':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S WiFi 5.0', 'media' ],
-			'GT9100':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
-			'I897':										[ STRINGS_SAMSUNG, 'Captivate' ],
-			'I7500':									[ STRINGS_SAMSUNG, 'Galaxy' ],
-			'I9000':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
-			'T959':										[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S Vibrant' ],
-			'Captivate-I897':							[ STRINGS_SAMSUNG, 'Captivate' ],
-			'Galaxy':									[ STRINGS_SAMSUNG, STRINGS_GALAXY ],
-			'Galaxy Note':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note' ],
-			'GalaxyS':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
-			'Galaxy S II':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
-			'Galaxy X':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' X' ],
-			'Galaxy Spica':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Spica' ],
-			'GALAXY Tab':								[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', TYPE_TABLET ],
-			'Vibrantmtd':								[ STRINGS_SAMSUNG, 'Vibrant' ],
-			'SC-01C':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab', TYPE_TABLET ],
-			'SC-01D':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 10.1 LTE', TYPE_TABLET ],
-			'SC-01E':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.7 Plus', TYPE_TABLET ],
-			'SC-02B':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S' ],
-			'SC-02C':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II' ],
-			'SC-02D':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Tab 7.0 Plus', TYPE_TABLET ],
-			'SC-02E':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note II' ],
-			'SC-03D':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II LTE' ],
-			'SC-04D':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Nexus' ],
-			'SC-05D':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' Note LTE' ],
-			'SC-06D':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S III' ],
-			'ISW11SC':									[ STRINGS_SAMSUNG, STRINGS_GALAXY + ' S II WiMAX' ],
-			'A01SH':									[ STRINGS_SHARP, 'A01SH' ],
-			'IS01':										[ STRINGS_SHARP, 'IS01' ],
-			'IS03':										[ STRINGS_SHARP, 'IS03' ],
-			'IS05':										[ STRINGS_SHARP, 'IS05' ],
-			'IS11SH':									[ STRINGS_SHARP, 'Aquos IS11SH' ],
-			'IS12SH':									[ STRINGS_SHARP, 'Aquos IS12SH' ],
-			'IS13SH':									[ STRINGS_SHARP, 'Aquos IS13SH' ],
-			'IS14SH':									[ STRINGS_SHARP, 'Aquos IS14SH' ],
-			'ISW16SH':									[ STRINGS_SHARP, 'Aquos ISW16SH' ],
-			'EB-W51GJ':									[ STRINGS_SHARP, 'EB-W51GJ' ],
-			'SBM003SH':									[ STRINGS_SHARP, 'Galapagos' ],
-			'SBM005SH':									[ STRINGS_SHARP, 'Galapagos' ],
-			'SBM006SH':									[ STRINGS_SHARP, 'Aquos' ],
-			'SBM007SH':									[ STRINGS_SHARP, 'Aquos 007SH' ],
-			'SBM009SH':									[ STRINGS_SHARP, 'Aquos 009SH' ],
-			'SBM102SH':									[ STRINGS_SHARP, 'Aquos 102SH' ],
-			'SBM103SH':									[ STRINGS_SHARP, 'Aquos 103SH' ],
-			'SBM104SH':									[ STRINGS_SHARP, 'Aquos 104SH' ],
-			'SBM107SH':									[ STRINGS_SHARP, 'Aquos 107SH' ],
-			'SBM107SHB':								[ STRINGS_SHARP, 'Aquos 107SH' ],
-			'SH-01D':									[ STRINGS_SHARP, 'Aquos SH-01D' ],
-			'SH-01E':									[ STRINGS_SHARP, 'Aquos si SH-01E' ],
-			'SH-02D':									[ STRINGS_SHARP, 'Aquos slider SH-02D' ],
-			'SH-02E':									[ STRINGS_SHARP, 'Aquos Zeta SH-02E' ],
-			'SH-03C':									[ STRINGS_SHARP, 'Lynx 3D' ],
-			'SH-06D':									[ STRINGS_SHARP, 'Aquos SH-06D' ],
-			'SH-09D':									[ STRINGS_SHARP, 'Aquos Zeta SH-09D' ],
-			'SH-10B':									[ STRINGS_SHARP, 'Lynx' ],
-			'SH-12C':									[ STRINGS_SHARP, 'Aquos' ],
-			'SH-13C':									[ STRINGS_SHARP, 'Aquos f SH-13C' ],
-			'SH80F':									[ STRINGS_SHARP, 'Aquos SH80F' ],
-			'SH530U':									[ STRINGS_SHARP, 'SH530U' ],
-			'SH72x8U':									[ STRINGS_SHARP, 'SH72x8U' ],
-			'SH8118U':									[ STRINGS_SHARP, 'SH8118U' ],
-			'SH8128U':									[ STRINGS_SHARP, 'SH8128U' ],
-			'SH8158U':									[ STRINGS_SHARP, 'SH8158U' ],
-			'SH8188U':									[ STRINGS_SHARP, 'SH8188U' ],
-			'SH8268U':									[ STRINGS_SHARP, 'SH8268U' ],
-			'INFOBAR C01':								[ STRINGS_SHARP, 'INFOBAR C01' ],
-			'SPX-5':									[ 'Simvalley', 'SPX-5' ],
-			'SPX-5 3G':									[ 'Simvalley', 'SPX-5 3G' ],
-			'SmartQ G7':								[ 'SmartQ', 'G7', TYPE_TABLET ],
-			'SmartQT7':									[ 'SmartQ', 'T7', TYPE_TABLET ],
-			'SmartQT10':								[ 'SmartQ', 'T10', TYPE_TABLET ],
-			'SmartQT15':								[ 'SmartQ', 'T15', TYPE_TABLET ],
-			'SmartQT19':								[ 'SmartQ', 'T19', TYPE_TABLET ],
-			'SmartQT20':								[ 'SmartQ', 'T20', TYPE_TABLET ],
-			'OMS1 6':									[ STRINGS_SONY_ERICSSON, 'A8i' ],
-			'C1504':									[ STRINGS_SONY, 'C1504' ],
-			'C65(02|03|06)!':							[ STRINGS_SONY, STRINGS_XPERIA + ' "Odin"' ],
-			'E10(a|i|iv)!':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10 Mini' ],
-			'E15(a|i|iv|i-o)?$!':						[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X8' ],
-			'E16i!':									[ STRINGS_SONY_ERICSSON, 'W8 Walkman' ],
-			'LT11i!':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo V' ],
-			'LT15(a|i|iv|i-o)?$!':						[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc' ],
-			'LT18(a|i|iv|i-o)?$!':						[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc S' ],
-			'LT22i!':									[ STRINGS_SONY, STRINGS_XPERIA + ' P' ],
-			'LT26(i|i-o)!':								[ STRINGS_SONY, STRINGS_XPERIA + ' S' ],
-			'LT26ii!':									[ STRINGS_SONY, STRINGS_XPERIA + ' SL' ],
-			'LT26w!':									[ STRINGS_SONY, STRINGS_XPERIA + ' Acro S' ],
-			'LT28(at|h|i)!':							[ STRINGS_SONY, STRINGS_XPERIA + ' Ion' ],
-			'LT29i!':									[ STRINGS_SONY, STRINGS_XPERIA + ' TX' ],
-			'LT30(at)!':								[ STRINGS_SONY, STRINGS_XPERIA + ' TL' ],
-			'LT30(a|p)!':								[ STRINGS_SONY, STRINGS_XPERIA + ' T' ],
-			'MK16(a|i)!':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Pro' ],
-			'MT11(a|i|iv|i-o)!':						[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo V' ],
-			'MT15(a|i|iv|i-o)!':						[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo' ],
-			'MT25i!':									[ STRINGS_SONY, STRINGS_XPERIA + ' Neo L' ],
-			'MT27i!':									[ STRINGS_SONY, STRINGS_XPERIA + ' Sola' ],
-			'R800(a|at|i|iv|x)!':						[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Play' ],
-			'SK17(a|i|iv|i-o)!':						[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Mini Pro' ],
-			'ST15(a|i)!':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Mini' ],
-			'ST17(a|i)!':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Active' ],
-			'ST18(a|av|i|iv)!':							[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Ray' ],
-			'ST21(i)?$!':								[ STRINGS_SONY, STRINGS_XPERIA + ' Tipo' ],
-			'ST21(a2|i2)!':								[ STRINGS_SONY, STRINGS_XPERIA + ' Tipo Dual' ],
-			'ST23i!':									[ STRINGS_SONY, STRINGS_XPERIA + ' Miro' ],
-			'ST25(a|i)!':								[ STRINGS_SONY, STRINGS_XPERIA + ' U' ],
-			'ST26i!':									[ STRINGS_SONY, STRINGS_XPERIA + ' J' ],
-			'ST27i!':									[ STRINGS_SONY, STRINGS_XPERIA + ' Go' ],
-			'U20(a|i|iv)!':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10 Mini Pro' ],
-			'WT13i!':									[ STRINGS_SONY_ERICSSON, 'Mix Walkman' ],
-			'WT18i!':									[ STRINGS_SONY_ERICSSON, 'Walkman' ],
-			'WT19(a|i|iv)!':							[ STRINGS_SONY_ERICSSON, 'Live with Walkman' ],
-			'X8':										[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X8' ],
-			'X10(a|i|iv|s)?$!':							[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10' ],
-			'X10 ?(Mini|Mini Pro)$!':					[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10 Mini Pro' ],
-			'Z1i':										[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Play' ],
-			'S51SE':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Mini' ],
-			'IS11S':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Acro' ],
-			'IS12S':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Acro HD' ],
-			'SO-01B':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10' ],
-			'SO-01C':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc' ],
-			'SO-01D':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Play' ],
-			'SO-01E':									[ STRINGS_SONY, STRINGS_XPERIA + ' AX' ],
-			'SO-02C':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Acro' ],
-			'SO-02D':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' NX' ],
-			'SO-03C':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Ray' ],
-			'SO-03D':									[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Acro HD' ],
-			'SO-04D':									[ STRINGS_SONY, STRINGS_XPERIA + ' GX' ],
-			'SO-05D':									[ STRINGS_SONY, STRINGS_XPERIA + ' SX' ],
-			'Xperia X1':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X1' ],
-			'Xperia X8':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X8' ],
-			'Xperia X10':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' X10' ],
-			'Xperia Ray':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Ray' ],
-			'Xperia Arc':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc' ],
-			'Xperia Arc S':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Arc S' ],
-			'Xperia Mini':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Mini' ],
-			'Xperia Neo':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo' ],
-			'Xperia NeoV':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo V' ],
-			'Xperia Neo V':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Neo V' ],
-			'Xperia Play':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Play' ],
-			'Xperia Pro':								[ STRINGS_SONY_ERICSSON, STRINGS_XPERIA + ' Pro' ],
-			'Xperia S':									[ STRINGS_SONY, STRINGS_XPERIA + ' S' ],
-			'Xperia Live with Walkman':					[ STRINGS_SONY_ERICSSON, 'Live with Walkman' ],
-			'Hayabusa':									[ STRINGS_SONY, STRINGS_XPERIA + ' Ion' ],
-			'Nozomi':									[ STRINGS_SONY, STRINGS_XPERIA + ' S' ],
-			'Tablet P':									[ STRINGS_SONY, 'Tablet P', TYPE_TABLET ],
-			'Tablet S':									[ STRINGS_SONY, 'Tablet S', TYPE_TABLET ],
-			'SGPT12':									[ STRINGS_SONY, 'Tablet S', TYPE_TABLET ],
-			'NWZ?-Z1000Series!':						[ STRINGS_SONY, 'Walkman Z', 'media' ],
-			'Spice Mi280':								[ 'Spice', 'Mi-280' ],
-			'Spice Mi300':								[ 'Spice', 'Mi-300' ],
-			'Spice Mi-310':								[ 'Spice', 'Mi-310' ],
-			'Spice Mi-355':								[ 'Spice', 'Mi-355' ],
-			'Spice Mi-425':								[ 'Spice', 'Mi-425' ],
-			'Spice Mi-500':								[ 'Spice', 'Mi-500' ],
-			'SPICE Mi-720':								[ 'Spice', 'Mi-720' ],
-			'A7272+':									[ 'Star', 'A7272+' ],
-			'e1109 v73 gq1002 ctp':						[ 'Star', 'X18i' ],
-			'TS1004T':									[ 'Surf 3Q', 'TS1004T', TYPE_TABLET ],
-			'SYTABEX7-2':								[ 'Sylvania', 'SYTABEX7', TYPE_TABLET ],
-			'KM-S200':									[ 'TAKE', 'Janus KM-S200' ],
-			'TCL A860':									[ 'TCL', 'A860' ],
-			'TCL A906':									[ 'TCL', 'A906' ],
-			'TCL A909':									[ 'TCL', 'A909' ],
-			'TCL A919':									[ 'TCL', 'A919' ],
-			'TCL A968':									[ 'TCL', 'A968' ],
-			'TCL A990':									[ 'TCL', 'A990' ],
-			'TCL A996':									[ 'TCL', 'A996' ],
-			'TCL A998':									[ 'TCL', 'A998' ],
-			'TCL C990+':								[ 'TCL', 'C990+' ],
-			'TCL GENESEE E708':							[ 'TCL', 'Genesee E708' ],
-			'TCL S500':									[ 'TCL', 'S500' ],
-			'(TCL )?S600!':								[ 'TCL', 'S600' ],
-			'TCL S900':									[ 'TCL', 'S900' ],
-			'A10t(5DM3)':								[ 'Teclast', 'A10T', TYPE_TABLET ],
-			'P72':										[ 'Teclast', 'P72', TYPE_TABLET ],
-			'P76TI':									[ 'Teclast', 'P76Ti', TYPE_TABLET ],
-			'P81HD':									[ 'Teclast', 'P81HD', TYPE_TABLET ],
-			'P85(R8A1)':								[ 'Teclast', 'P85', TYPE_TABLET ],
-			'Teclast P85':								[ 'Teclast', 'P85', TYPE_TABLET ],
-			'T720 SE':									[ 'Teclast', 'T720', TYPE_TABLET ],
-			'T760 from moage.com':						[ 'Teclast', 'T760', TYPE_TABLET ],
-			'tegav2':									[ 'Tegatech', 'TEGA v2', TYPE_TABLET ],
-			'TM-7025':									[ 'teXet', 'TM-7025', TYPE_TABLET ],
-			'MoFing':									[ 'Thomson', 'MoFing', TYPE_TABLET ],
-			'Ultimate10':								[ 'Tomtec', 'Ultimate10', TYPE_TABLET ],
-			'ThL V7':									[ 'THL', 'V7' ],
-			'ThL V8':									[ 'THL', 'V8' ],
-			'ThL V9':									[ 'THL', 'V9' ],
-			'ThL V11':									[ 'THL', 'V11' ],
-			'TSB CLOUD COMPANION;TOSHIBA AC AND AZ':	[ STRINGS_TOSHIBA, 'Dynabook AZ', 'desktop' ],
-			'TOSHIBA AC AND AZ':						[ STRINGS_TOSHIBA, 'Dynabook AZ', 'desktop' ],
-			'TOSHIBA FOLIO AND A':						[ STRINGS_TOSHIBA, 'Folio 100', TYPE_TABLET ],
-			'T-01C':									[ STRINGS_TOSHIBA, 'Regza T-01C' ],
-			'T-01D':									[ STRINGS_TOSHIBA, 'Regza T-01D' ],
-			'T-02D':									[ STRINGS_TOSHIBA, 'Regza T-02D' ],
-			'IS04':										[ STRINGS_TOSHIBA, 'Regza IS04' ],
-			'IS11T':									[ STRINGS_TOSHIBA, 'Regza IS11T' ],
-			'AT1S0':									[ STRINGS_TOSHIBA, 'Regza AT1S0' ],
-			'Tostab03':									[ STRINGS_TOSHIBA, 'Regza AT100', TYPE_TABLET ],
-			'AT100':									[ STRINGS_TOSHIBA, 'Regza AT100', TYPE_TABLET ],
-			'AT200':									[ STRINGS_TOSHIBA, 'Regza AT200', TYPE_TABLET ],
-			'AT300':									[ STRINGS_TOSHIBA, 'Regza AT300', TYPE_TABLET ],
-			'AT470':									[ STRINGS_TOSHIBA, 'Regza AT470', TYPE_TABLET ],
-			'AT570':									[ STRINGS_TOSHIBA, 'Regza AT570', TYPE_TABLET ],
-			'AT830':									[ STRINGS_TOSHIBA, 'Regza AT830', TYPE_TABLET ],
-			'Folio 100':								[ STRINGS_TOSHIBA, 'Folio 100', TYPE_TABLET ],
-			'folio100':									[ STRINGS_TOSHIBA, 'Folio 100', TYPE_TABLET ],
-			'THRiVE':									[ STRINGS_TOSHIBA, 'THRiVE', TYPE_TABLET ],
-			'Fantastic T3':								[ 'TWM', 'Fantastic T3' ],
-			'M70014':									[ 'United Star Technology', 'M70014', TYPE_TABLET ],
-			'PS47':										[ 'Velocity Micro', 'Cruz PS47', TYPE_TABLET ],
-			'T301':										[ 'Velocity Micro', 'Cruz T301', TYPE_TABLET ],
-			'Vibo-A688':								[ 'FIH', 'Vibo A688' ],
-			'Videocon-V7500':							[ 'Videocon', 'V7500' ],
-			'GTablet':									[ 'ViewSonic', 'gTablet', TYPE_TABLET ],
-			'GtabComb':									[ 'ViewSonic', 'gTablet', TYPE_TABLET ],
-			'TeamDRH ICS for GTablet':					[ 'ViewSonic', 'gTablet', TYPE_TABLET ],
-			'ViewPad7':									[ 'ViewSonic', 'ViewPad 7', TYPE_TABLET ],
-			'ViewPad 10e':								[ 'ViewSonic', 'ViewPad 10e', TYPE_TABLET ],
-			'VTAB1008':									[ 'Vizio', 'VTAB1008', TYPE_TABLET ],
-			'VTAB3010':									[ 'Vizio', 'VTAB3010', TYPE_TABLET ],
-			'VOTO W5300':								[ 'VOTO', 'W5300' ],
-			'xPAD-70':									[ 'WayteQ', 'xPAD-70', TYPE_TABLET ],
-			'xTAB-70':									[ 'WayteQ', 'xTAB-70', TYPE_TABLET ],
-			'WellcoM-A99':								[ 'WellcoM', 'A99' ],
-			'N12':										[ 'Window', 'N12', TYPE_TABLET ],
-			'N12R':										[ 'Window', 'N12R', TYPE_TABLET ],
-			'N50':										[ 'Window', 'N50', TYPE_TABLET ],
-			'N50DT':									[ 'Window', 'N50DT', TYPE_TABLET ],
-			'N50GT':									[ 'Window', 'N50GT', TYPE_TABLET ],
-			'N50GT A':									[ 'Window', 'N50GT-A', TYPE_TABLET ],
-			'N70':										[ 'Window', 'N70', TYPE_TABLET ],
-			'N70 DUAL CORE':							[ 'Window', 'N70 Dual Core', TYPE_TABLET ],
-			'N80':										[ 'Window', 'N80', TYPE_TABLET ],
-			'N90':										[ 'Window', 'N90', TYPE_TABLET ],
-			'N90 DUAL CORE2!':							[ 'Window', 'N90 Dual Core', TYPE_TABLET ],
-			'N101 DUAL CORE2!':							[ 'Window', 'N101 Dual Core', TYPE_TABLET ],
-			'N612':										[ 'Wishway', 'N612' ],
-			'AT-AS43D':									[ 'Wolfgang', 'AT-AS43D' ],
-			'M12':										[ 'Wopad', 'M12', TYPE_TABLET ],
-			'WM8650':									[ 'WonderMedia', 'WM8650', TYPE_TABLET ],
-			'MI-ONE':									[ 'Xiaomi', 'MI-ONE' ],
-			'MI 1S':									[ 'Xiaomi', 'MI-ONE S' ],
-			'MI 1SC':									[ 'Xiaomi', 'MI-ONE SC' ],
-			'MI-ONE C1':								[ 'Xiaomi', 'MI-ONE C1' ],
-			'MI-ONE Plus':								[ 'Xiaomi', 'MI-ONE Plus' ],
-			'mione plus':								[ 'Xiaomi', 'MI-ONE Plus' ],
-			'MI-TWO':									[ 'Xiaomi', 'MI-TWO' ],
-			'Q07CL01':									[ 'XVision', 'Q07', TYPE_TABLET ],
-			'N6':										[ 'Yarvik', '210 Tablet', TYPE_TABLET ],
-			'EMR1879':									[ 'Yidong', 'EMR1879', TYPE_TABLET ],
-			'yusun W702':								[ 'Yusun', 'W702' ],
-			'YX-YUSUN E80':								[ 'Yusun', 'E80' ],
-			'zt180':									[ 'Zenithink', 'ZT-180', TYPE_TABLET ],
-			'Jaguar7':									[ 'ZiiLabs', 'Jaguar 7', TYPE_TABLET ],
-			'Ziss Ranger HD':							[ 'Ziss', 'Ranger HD' ],
-			'ZTE Libra':								[ STRINGS_ZTE, 'Libra' ],
-			'ZTE T T9':									[ STRINGS_ZTE, 'Light Tab T9', TYPE_TABLET ],
-			'V9':										[ STRINGS_ZTE, 'Light Tab V9', TYPE_TABLET ],
-			'V9e+':										[ STRINGS_ZTE, 'Light Tab 2', TYPE_TABLET ],
-			'V9A':										[ STRINGS_ZTE, 'Light Tab 2', TYPE_TABLET ],
-			'Light Tab 2W':								[ STRINGS_ZTE, 'Light Tab 2', TYPE_TABLET ],
-			'Light Tab 2':								[ STRINGS_ZTE, 'Light Tab 2', TYPE_TABLET ],
-			'V9C':										[ STRINGS_ZTE, 'Light Tab 3', TYPE_TABLET ],
-			'V55':										[ STRINGS_ZTE, 'Optik', TYPE_TABLET ],
-			'Acqua':									[ STRINGS_ZTE, 'Acqua' ],
-			'ZTE Blade':								[ STRINGS_ZTE, 'Blade' ],
-			'a5':										[ STRINGS_ZTE, 'Blade' ],
-			'Blade S':									[ STRINGS_ZTE, 'Blade S' ],			
-			'Skate':									[ STRINGS_ZTE, 'Skate' ],
-			'ZTE Skate':								[ STRINGS_ZTE, 'Skate' ],
-			'X500':										[ STRINGS_ZTE, 'X500 Score' ],
-			'ZTE X500':									[ STRINGS_ZTE, 'X500 Score' ],
-			'ZTE C X500':								[ STRINGS_ZTE, 'X500 Score' ],
-			'ZTE C N600!':								[ STRINGS_ZTE, 'N600' ],
-			'ZTE C N606':								[ STRINGS_ZTE, 'N606' ],
-			'ZTE C N700':								[ STRINGS_ZTE, 'N700' ],
-			'ZTE U N720':								[ STRINGS_ZTE, 'N720' ],
-			'ZTE C R750':								[ STRINGS_ZTE, 'R750' ],
-			'ZTE C N760':								[ STRINGS_ZTE, 'N760' ],
-			'ZTE V768':									[ STRINGS_ZTE, 'V768 Concord' ],
-			'ZTE N788':									[ STRINGS_ZTE, 'N788' ],
-			'ZTE V788!':								[ STRINGS_ZTE, 'V788 Kis' ],
-			'ZTE U788!':								[ STRINGS_ZTE, 'U788 Kis' ],
-			'ZTE U795':									[ STRINGS_ZTE, 'U795' ],
-			'ZTE T U802':								[ STRINGS_ZTE, 'U802' ],
-			'RacerII':									[ STRINGS_ZTE, 'U806 Racer II' ],
-			'ZTE T U806':								[ STRINGS_ZTE, 'U806 Racer II' ],
-			'E810':										[ STRINGS_ZTE, 'E810' ],
-			'ZTE T U812':								[ STRINGS_ZTE, 'U812' ],
-			'ZTE GV821':								[ STRINGS_ZTE, 'V821' ],
-			'ZTE T U830':								[ STRINGS_ZTE, 'U830' ],		
-			'ZTE Racer':								[ STRINGS_ZTE, 'X850 Racer' ],
-			'MTC 916':									[ STRINGS_ZTE, 'X850 Racer' ],
-			'Racer':									[ STRINGS_ZTE, 'X850 Racer' ],
-			'ZTE U X850':								[ STRINGS_ZTE, 'X850 Racer' ],
-			'ZTE U V852':								[ STRINGS_ZTE, 'V852 Dreamer' ],
-			'ZTE N855D':								[ STRINGS_ZTE, 'N855D' ],
-			'ZTE U V856':								[ STRINGS_ZTE, 'V856 Mimosa Mini' ],
-			'ZTE V856':									[ STRINGS_ZTE, 'V856 Mimosa Mini' ],
-			'ZTE U V857':								[ STRINGS_ZTE, 'V857' ],
-			'N860':										[ STRINGS_ZTE, 'N860 Warp' ],
-			'ZTE U? X876!':								[ STRINGS_ZTE, 'X876 Raise' ],
-			'ZTE V877!':								[ STRINGS_ZTE, 'V877' ],
-			'N880':										[ STRINGS_ZTE, 'N880 Blade' ],
-			'ZTE C N880!':								[ STRINGS_ZTE, 'N880 Blade' ],
-			'U880':										[ STRINGS_ZTE, 'U880 Blade' ],
-			'ZTE ?U880!':								[ STRINGS_ZTE, 'U880 Blade' ],
-			'ZTE T ?U880!':								[ STRINGS_ZTE, 'U880 Blade' ],
-			'V880':										[ STRINGS_ZTE, 'V880 Blade' ],
-			'ZTE (U )?V880!':							[ STRINGS_ZTE, 'V880 Blade' ],
-			'ZTE U(V)880+':								[ STRINGS_ZTE, 'V880 Blade' ],
-			'Blade(-V880|-opda)?$!':					[ STRINGS_ZTE, 'V880 Blade' ],
-			'ZTE N880E':								[ STRINGS_ZTE, 'N880E' ],
-			'ZTE N882E':								[ STRINGS_ZTE, 'N882E' ],
-			'BLADEII':									[ STRINGS_ZTE, 'V881 Blade II' ],
-			'Blade2':									[ STRINGS_ZTE, 'V881 Blade II' ],
-			'ZTE U V881':								[ STRINGS_ZTE, 'V881 Blade II' ],			
-			'ZTE ?U885!':								[ STRINGS_ZTE, 'U885' ],
-			'ZTE V889!':								[ STRINGS_ZTE, 'V889' ],
-			'ZTE T ?U900!':								[ STRINGS_ZTE, 'U900' ],	
-			'ZTE N910':									[ STRINGS_ZTE, 'N910 Anthem' ],
-			'ZTE C X920':								[ STRINGS_ZTE, 'X920' ],
-			'ZXY-ZTE-C X920':							[ STRINGS_ZTE, 'X920' ],
-			'ZTE U930':									[ STRINGS_ZTE, 'U930 Grand X' ],
-			'ZTE Grand X':								[ STRINGS_ZTE, 'U930 Grand X' ],
-			'Grand X In':								[ STRINGS_ZTE, 'U930 Grand X' ],
-			'ZTE (U )?V960!':							[ STRINGS_ZTE, 'V960 Skate' ],
-			'ZTE T ?U960!':								[ STRINGS_ZTE, 'U960 Skate' ],
-			'ZTE U960s2':								[ STRINGS_ZTE, 'U960s2' ],
-			'ZTE N970':									[ STRINGS_ZTE, 'N970 Grand X' ],
-			'ZTE U970':									[ STRINGS_ZTE, 'U970 Grand X' ],
-			'ZTE V970':									[ STRINGS_ZTE, 'Z970 Grand X' ],
-			'ZTE U985':									[ STRINGS_ZTE, 'U985 Grand Era' ],
-			'ZTE Roamer':								[ STRINGS_ZTE, 'Z990 Roamer ' ],
-			'ZTE Z990!':								[ STRINGS_ZTE, 'Z990 Roamer' ],
-			'003Z':										[ STRINGS_ZTE, 'Softbank 003Z' ],
-			'008Z':										[ STRINGS_ZTE, 'Softbank 008Z' ],
-			'009Z':										[ STRINGS_ZTE, 'Softbank Star7' ],
-			'ZP100':									[ 'Zopo', 'ZP100' ],
-			'ZP300':									[ 'Zopo', 'ZP300' ],
-			'ZP500':									[ 'Zopo', 'ZP500' ],
-	
-			/* Telecom provider branded devices */
-			'i-mobile i691':							[ 'i-Mobile', 'i691' ],
-			'i-mobile i695':							[ 'i-Mobile', 'i695' ],
-			'i-mobile i858':							[ 'i-Mobile', 'i858' ],
-			'i-mobile 3G 8500':							[ 'i-Mobile', '3G 8500' ],
-			'i-mobile i-style 3':						[ 'i-Mobile', 'i-Style 3' ],	
-			'i-mobile i-style Q1':						[ 'i-Mobile', 'i-Style Q1' ],						
-			'i-mobile i-STYLE Q2':						[ 'i-Mobile', 'i-Style Q2' ],			
-			'i-mobile i-STYLE Q2 DUO':					[ 'i-Mobile', 'i-Style Q2 Duo' ],	
-			'i-mobile i-STYLE Q6':						[ 'i-Mobile', 'i-Style Q6' ],						
-			'i-mobile I-Note':							[ 'i-Mobile', 'i-Note', TYPE_TABLET ],
-	
-			'Optimus Boston':							[ 'Optimus', 'Boston' ],							/* Gigabyte GSmart G1305 */
-			'Optimus San Francisco':					[ 'Optimus', 'San Francisco' ],						/* ZTE Blade */
-			'Optimus Monte Carlo':						[ 'Optimus', 'Monte Carlo' ],						/* ZTE Skate */
-			
-			'Orange Boston':							[ 'Orange', 'Boston' ],								/* Gigabyte GSmart G1305 */
-			'Orange Monte Carlo':						[ 'Orange', 'Monte Carlo' ],						/* ZTE Skate */
-			'San Francisco':							[ 'Orange', 'San Francisco' ],						/* ZTE Blade */
-			'San Francisco for Orange':					[ 'Orange', 'San Francisco' ],						/* ZTE Blade */
-			'Orange San Francisco':						[ 'Orange', 'San Francisco' ],						/* ZTE Blade */
-			
-			'MOVE':										[ 'T-Mobile', 'MOVE' ],								/* Alcatel One Touch 908 */
-			'T-Mobile G1':								[ 'T-Mobile', 'G1' ],								/* HTC Dream */
-			'T-Mobile G2':								[ 'T-Mobile', 'G2' ],								/* HTC Desire Z */
-			'T-Mobile G2 Touch':						[ 'T-Mobile', 'G2' ],								/* HTC Desire Z */
-			'LG-P999':									[ 'T-Mobile', 'G2x' ],								/* LG Optimus 2X */
-			'LG-E739':									[ 'T-Mobile', 'myTouch' ],							/* LG E739 */
-			'T-Mobile myTouch 3G':						[ 'T-Mobile', 'myTouch 3G'],						/* HTC Magic */
-			'T-Mobile myTouch 3G Slide':				[ 'T-Mobile', 'myTouch 3G Slide' ],					/* HTC Espresso */
-			'T-Mobile Espresso':						[ 'T-Mobile', 'myTouch 3G Slide' ],					/* HTC Espresso */
-			'HTC myTouch 3G Slide':						[ 'T-Mobile', 'myTouch 3G Slide' ],					/* HTC Espresso */
-			'T-Mobile myTouch 4G':						[ 'T-Mobile', 'myTouch 4G' ],						/* HTC Glacier */
-			'HTC Glacier':								[ 'T-Mobile', 'myTouch 4G' ],						/* HTC Glacier */
-			'HTC Panache':								[ 'T-Mobile', 'myTouch 4G' ],						/* HTC Glacier */
-			'My ?Touch ?4G$!':							[ 'T-Mobile', 'myTouch 4G' ],						/* HTC Glacier */
-			'HTC My ?Touch ?4G$!':						[ 'T-Mobile', 'myTouch 4G' ],						/* HTC Glacier */
-			'HTC myTouch 4G Slide':						[ 'T-Mobile', 'myTouch 4G Slide' ],					/* HTC Doubleshot */
-			'myTouch 4G Slide':							[ 'T-Mobile', 'myTouch 4G Slide' ],					/* HTC Doubleshot */
-			'T-Mobile myTouch Q':						[ 'T-Mobile', 'myTouch Q' ],						/* Huawei U8730 */
-			'LG-C800':									[ 'T-Mobile', 'myTouch Q' ],
-			'Pulse Mini':								[ 'T-Mobile', 'Pulse Mini' ],						/* Huawei U8110 */
-			
-			'Vodafone 845':								[ 'Vodafone', '845 Nova' ],							/* Huawei U8100 */
-			'Vodafone 858':								[ 'Vodafone', '858 Smart' ],						/* Huawei U8160 */
-			'Vodafone 945':								[ 'Vodafone', '945' ],								/* ZTE Joe */
-			'Vodafone Smart II':						[ 'Vodafone', 'Smart II' ],
-			'SmartTab10':								[ 'Vodafone', 'SmartTab 10', TYPE_TABLET ]				/* ZTE Web Tab 10 */
-		};
-			
-		var TIZEN_MODELS = {
-			'GT-I9500':									[ STRINGS_SAMSUNG, 'GT-I9500' ]
-		}
-
-		var TOUCHWIZ_MODELS = {
-			'GT-S3370C':								[ STRINGS_SAMSUNG, 'Corby 3G' ],
-			'GT-S36(50|53)!':							[ STRINGS_SAMSUNG, 'Corby' ],
-			'GT-S3850':									[ STRINGS_SAMSUNG, 'Corby II' ],
-			'GT-S52(30|33)!':							[ STRINGS_SAMSUNG, 'Star' ],
-			'GT-S5260':									[ STRINGS_SAMSUNG, 'Star II' ],
-			'GT-S5560':									[ STRINGS_SAMSUNG, 'Marvel' ],
-			'GT-S5620!':								[ STRINGS_SAMSUNG, 'Monte' ],
-			'GT-S5680':									[ STRINGS_SAMSUNG, 'GT-S5680' ],
-			'GT-S7550':									[ STRINGS_SAMSUNG, 'Blue Earth' ],
-			'GT-S80(00|03)!':							[ STRINGS_SAMSUNG, 'Jet' ],
-			'SGH-F480':									[ STRINGS_SAMSUNG, 'Tocco' ],
-			'SGH-T528g':								[ STRINGS_SAMSUNG, 'Straight Talk' ],
-			'GT-B3410':									[ STRINGS_SAMSUNG, 'Star Qwerty' ],
-			'GT-B5310':									[ STRINGS_SAMSUNG, 'Corby Pro' ],
-			'GT-B7722':									[ STRINGS_SAMSUNG, 'Star Duos' ],
-			'GT-C6712':									[ STRINGS_SAMSUNG, 'Star II Duos' ]
-		}
-		
-		var BADA_MODELS = {
-			'GT- ?S52(50|53)!':							[ STRINGS_SAMSUNG, 'Wave 525' ],
-			'GT-S5330':									[ STRINGS_SAMSUNG, 'Wave 533' ],
-			'GT-S5380!':								[ STRINGS_SAMSUNG, 'Wave Y' ],
-			'GT-S57(50|53)!':							[ STRINGS_SAMSUNG, 'Wave 575' ],
-			'GT-S72(30|33)!':							[ STRINGS_SAMSUNG, 'Wave 723' ],
-			'GT-S7250!':								[ STRINGS_SAMSUNG, 'Wave M' ],
-			'GT-S8500!':								[ STRINGS_SAMSUNG, 'Wave' ],
-			'GT-S8530':									[ STRINGS_SAMSUNG, 'Wave II' ],
-			'GT-S8600':									[ STRINGS_SAMSUNG, 'Wave 3' ],
-			'SHW-M410':									[ STRINGS_SAMSUNG, 'Wave 3' ]
-		}
-		
-		var BREW_MODELS = {
-			'Coolpad D508':								[ STRINGS_COOLPAD, 'D508' ],
-			'Coolpad E600':								[ STRINGS_COOLPAD, 'E600' ],
-			'SCH-F839':									[ STRINGS_SAMSUNG, 'SCH-F839' ]
-		}
-
-		var WINDOWS_MOBILE_MODELS = {
-			'DX900':									[ STRINGS_ACER, 'Tempo DX900' ],
-			'F900':										[ STRINGS_ACER, 'Tempo F900' ],
-			'Coolpad F800':								[ STRINGS_COOLPAD, 'F800' ],
-			'garmin-asus-Nuvifone-M10':					[ 'Garmin-Asus', 'Nuvifone M10' ],
-			'HP iPAQ 510':								[ 'HP', 'iPAQ 510' ],
-			'((HTC )?HD mini|.*T5555)!':				[ STRINGS_HTC, 'HD mini' ],
-			'((HTC )?HD2|.*T8585)!':					[ STRINGS_HTC, 'HD2' ],
-			'T-Mobile LEO':								[ STRINGS_HTC, 'HD2' ],
-			'dopodT5588':								[ STRINGS_HTC, 'Hengshan' ],
-			'(HTC Mega|.*T3333)!':						[ STRINGS_HTC, 'Mega' ],
-			'(HTC Snap|.*S521)!':						[ STRINGS_HTC, 'Snap' ],
-			'(HTC Touch2|.*T33(20|33|35))!':			[ STRINGS_HTC, 'Touch 2' ],
-			'(HTC Touch Diamond2|.*T5353)!':			[ STRINGS_HTC, 'Touch Diamond 2' ],
-			'(HTC Touch Diamond|.*P3700)!':				[ STRINGS_HTC, 'Touch Diamond' ],
-			'(HTC Touch HD2|.*T8585)!':					[ STRINGS_HTC, 'Touch HD2' ],
-			'(HTC Touch HD|.*T82(82|83))!':				[ STRINGS_HTC, 'Touch HD' ],
-			'(HTC Touch Pro2|.*T73(73|80))!':			[ STRINGS_HTC, 'Touch Pro 2' ],
-			'HTC TyTN II':								[ STRINGS_HTC, 'TyTN II' ],
-			'GT-B7300':									[ STRINGS_SAMSUNG, 'Omnia Lite' ],
-			'GT-B7610':									[ STRINGS_SAMSUNG, 'Omnia Pro' ],
-			'GT-I8000!':								[ STRINGS_SAMSUNG, 'Omnia 2' ],
-			'M1i': 										[ STRINGS_SONY_ERICSSON, 'M1i Aspen' ]
-		}		
-
-		var WINDOWS_PHONE_MODELS = {
-			'Allegro':									[ STRINGS_ACER, 'Allegro' ],
-			'M310':										[ STRINGS_ACER, 'Allegro' ],
-			'Galaxy6':									[ STRINGS_ASUS, 'Galaxy 6' ],
-			'Venue Pro':								[ 'Dell', 'Venue Pro' ],
-			'IS12T':									[ 'Fujitsu Toshiba', 'IS12T' ],
-			'USCCHTC-PC93100':							[ STRINGS_HTC, 'Arrive' ],
-			'Gold':										[ STRINGS_HTC, 'Gold' ],
-			'HD2':										[ STRINGS_HTC, 'HD2' ],
-			'LEO':										[ STRINGS_HTC, 'HD2' ],
-			'(HD7|.*T92(92|95|96))!':					[ STRINGS_HTC, 'HD7' ],
-			'(7 Pro|.*T75(75|76))!':					[ STRINGS_HTC, '7 Pro' ],
-			'((7 )?Mozart|.*T86(97|98))!':				[ STRINGS_HTC, '7 Mozart' ],
-			'PD67100':									[ STRINGS_HTC, '7 Mozart' ], 
-			'((7 )?Trophy|.*T8686)!':					[ STRINGS_HTC, 'Trophy' ],
-			'mwp6985':									[ STRINGS_HTC, 'Trophy' ],
-			'PC40100':									[ STRINGS_HTC, 'Trophy' ],
-			'Touch-IT Trophy':							[ STRINGS_HTC, 'Trophy' ],
-			'(Radar|.*C110e)!':							[ STRINGS_HTC, 'Radar' ],
-			'Mazaa':									[ STRINGS_HTC, 'Mazaa' ], 
-			'Mondrian':									[ STRINGS_HTC, 'Mondrian' ],
-			'(Schubert|.*T9292)!':						[ STRINGS_HTC, 'Schubert' ],
-			'Spark':									[ STRINGS_HTC, 'Spark' ],
-			'.*T8788!':									[ STRINGS_HTC, 'Surround' ],
-			'.*X310e!':									[ STRINGS_HTC, 'Titan' ],
-			'PI39100':									[ STRINGS_HTC, 'Titan' ],
-			'PI86100':									[ STRINGS_HTC, 'Titan II' ],
-			'Ultimate':									[ STRINGS_HTC, 'Ultimate' ],
-			'HTC6990LVW':								[ STRINGS_HTC, '8X' ],
-			'RIO U':									[ STRINGS_HTC, '8X' ],
-			'HUAWEI Ascend W1!':						[ STRINGS_HUAWEI, 'Ascend W1' ],
-			'GW910':									[ STRINGS_LG, 'Optimus 7' ],
-			'LG-E-?900!':								[ STRINGS_LG, 'Optimus 7 E900' ],
-			'LG-E906':									[ STRINGS_LG, 'Jil Sander' ],
-			'LG-C900!':									[ STRINGS_LG, 'Optimus 7Q' ],
-			'Lumia 510!':								[ 'Nokia', 'Lumia 510' ],
-			'Lumia 610!':								[ 'Nokia', 'Lumia 610' ],
-			'(Lumia |Nokia )?710!':						[ 'Nokia', 'Lumia 710' ],
-			'Lumia 719':								[ 'Nokia', 'Lumia 719' ],
-			'(Lumia |Nokia )?800!':						[ 'Nokia', 'Lumia 800' ],
-			'SeaRay':									[ 'Nokia', 'Lumia 800' ],
-			'Lumia 810!':								[ 'Nokia', 'Lumia 810' ],
-			'Lumia 820!':								[ 'Nokia', 'Lumia 820' ],
-			'Lumia 822!':								[ 'Nokia', 'Lumia 822' ],
-			'(Lumia |Nokia )?900!':						[ 'Nokia', 'Lumia 900' ],
-			'Lumia 920!':								[ 'Nokia', 'Lumia 920' ],
-			'GT-I8350!':								[ STRINGS_SAMSUNG, 'Omnia W' ],
-			'GT-i8700':									[ STRINGS_SAMSUNG, 'Omnia 7' ],
-			'GT-I8750':									[ STRINGS_SAMSUNG, 'Ativ S' ],
-			'GT-S7530':									[ STRINGS_SAMSUNG, 'Omnia M' ],
-			'SGH-i667':									[ STRINGS_SAMSUNG, 'Focus 2' ],
-			'SGH-i677':									[ STRINGS_SAMSUNG, 'Focus Flash' ],
-			'SGH-i707':									[ STRINGS_SAMSUNG, 'Taylor' ],
-			'SGH-i917!':								[ STRINGS_SAMSUNG, 'Focus' ],
-			'SGH-i937!':								[ STRINGS_SAMSUNG, 'Focus S' ],
-			'SGH-T899M':								[ STRINGS_SAMSUNG, 'Ativ S' ],
-			'OM(NI|IN)A ?7!':							[ STRINGS_SAMSUNG, 'Omnia 7' ],
-			'Taylor':									[ STRINGS_SAMSUNG, 'Taylor' ],
-			'CETUS':									[ STRINGS_SAMSUNG, 'Cetus' ],
-			'I917':										[ STRINGS_SAMSUNG, 'Cetus' ],
-			'S606':										[ 'TCL', 'Horizon S606' ],
-			'TSUNAGI':									[ 'Toshiba', 'Tsunagi' ],
-			'N880e!':									[ STRINGS_ZTE, 'N880e' ],
-			'V965W':									[ STRINGS_ZTE, 'V965W Tania' ],
-			'Tania':									[ STRINGS_ZTE, 'V965W Tania' ]
-		};
-		
-		var BLACKBERRY_MODELS = {
-			'9600':			'Bold',
-			'9650':			'Bold',
-			'9700':			'Bold',
-			'9780':			'Bold',
-			'9790':			'Bold',
-			'9900':			'Bold',
-			'9930':			'Bold',
-			'8300':			'Curve',
-			'8310':			'Curve',
-			'8320':			'Curve',
-			'8330':			'Curve',
-			'8350i':		'Curve',
-			'8520':			'Curve',
-			'8530':			'Curve',
-			'8900':			'Curve',
-			'9220':			'Curve',
-			'9300':			'Curve',
-			'9310':			'Curve',
-			'9320':			'Curve',
-			'9330':			'Curve',
-			'9350':			'Curve',
-			'9360':			'Curve',
-			'9370':			'Curve',
-			'9380':			'Curve',
-			'8100':			'Pearl',
-			'8110':			'Pearl',
-			'8120':			'Pearl',
-			'8130':			'Pearl',
-			'8220':			'Pearl',
-			'8230':			'Pearl',
-			'9100':			'Pearl',
-			'9105':			'Pearl',
-			'9530':			'Storm',
-			'9550':			'Storm',
-			'9670':			'Style',
-			'9800':			'Torch',
-			'9810':			'Torch',
-			'9850':			'Torch',
-			'9860':			'Torch',
-			'9630':			'Tour',
-			'9981':			'Porsche P'
-		};
-				
-		return DeviceModels;
-	})();
-	
-	
-	
- 	var Version = function() { this.initialize.apply(this, Array.prototype.slice.call(arguments)) };
-	Version.prototype = {
-		initialize: function(v) {
-			this.original = v.value || null;
-			this.alias = v.alias || null;
-			this.details = v.details || null;
-			this.builds = typeof v.builds != 'undefined' ? v.builds : true;
-
-			this.major = 0;
-			this.minor = 0;
-			this.revision = '';
-			this.build = '';
-			this.type = '';
-						
-			var match;
-			if (match = /([0-9]+)(?:\.([0-9]+))?(?:\.([0-9]+))?(?:\.([0-9]+))?(?:([ab])([0-9]+))?/.exec(this.original)) {
-				if (typeof match[1] != 'undefined') {
-					this.major = match[1];
-				}
-
-				if (typeof match[2] != 'undefined') {
-					this.minor = match[2];
-				}
-
-				if (typeof match[3] != 'undefined') {
-					this.revision = match[3];
-				}
-
-				if (typeof match[4] != 'undefined') {
-					this.build = match[4];
-				}
-
-				if (typeof match[5] != 'undefined') {
-					switch(match[5]) {
-						case 'a':	this.type = 'alpha'; break;
-						case 'b':	this.type = 'beta'; break;
-					}
-
-					if (typeof match[6] != 'undefined') {
-						this.build = match[6];
-					}
-				}
-			}
-		},
-		
-		is: function(v) {
-			var compare = new Version({ value: v });
-			return this.valueOf() == compare.valueOf();
-		},
-		
-		isOlder: function(v) {
-			var compare = new Version({ value: v });
-			return this.valueOf() < compare.valueOf();
-		},
-		
-		isNewer: function(v) {
-			var compare = new Version({ value: v });
-			return this.valueOf() > compare.valueOf();
-		},
-		
-		valueOf: function() {
-			return parseFloat('' + this.major + '.' + ('0000' + this.minor).slice(-4));
-		},
-		
-		toString: function() {
-			if (this.alias)
-				return this.alias;
-
-			var version = '';
-
-			if (this.major || this.minor) {
-				var v = [];
-				v.push(this.major);
-				if (this.minor != '' && this.minor != null) v.push(this.minor);
-				if (this.revision != '' && this.revision != null) v.push(this.revision);
-				if (this.type == '' && this.build) v.push(this.build);
-				if (this.details < 0) v.splice(this.details, 0 - this.details);
-				if (this.details > 0) v.splice(this.details, v.length - this.details);
-				
-				if (!this.builds) {
-					for (var i = 0; i < v.length; i++) {
-						if (v[i] > 999) {
-							v.splice(i, 1);
-							i--;
-						}					
-					}
-				}
-				
-				version = v.join('.');
-			
-				if (this.type != '') version += this.type[0] + (this.build ? this.build : '');
-			}
-
-			return version;
-		}
-	}
-		
- 	var Detected = function() { this.initialize.apply(this, arguments) };
-	Detected.prototype = {
-		initialize: function(ua, options) {
-			this.options = {
-				useFeatures:		options && options.useFeatures || false,
-				detectCamouflage:	options && options.detectCamouflage || false
-			}
-
-			this.browser = { 'stock': true, 'hidden': false, 'channel': '' };	
-			this.engine = {};	
-			this.os = {};	
-			this.device = { 'type':	'desktop', 'identified': false };
-			
-			this.camouflage = false;
-			this.features = [];
-			
-			this.detect(ua);
-		},
-		
-		isX: function() {
-			var valid = true;
-			var x = arguments[0];
-			
-			if (arguments.length >= 2) {
-				valid = valid && this[x].name == arguments[1];
-			}
-			
-			if (arguments.length >= 4 && typeof this[x].version != 'undefined' && valid) {
-				var v1 = 0 + this[x].version;
-				var v2 = 0 + new Version({ value: arguments[3] });
-				switch (arguments[2]) {
-					case '<':	valid = valid && v1 < v2; break;
-					case '<=':	valid = valid && v1 <= v2; break;
-					case '=':	valid = valid && v1 == v2; break;
-					case '>':	valid = valid && v1 > v2; break;
-					case '>=':	valid = valid && v1 >= v2; break;
-				}
-			}
-			
-			return valid;
-		},
-		
-		isBrowser: function() { var a = Array.prototype.slice.call(arguments); a.unshift('browser'); return this.isX.apply(this, a); },
-		isEngine: function() { var a = Array.prototype.slice.call(arguments); a.unshift('engine'); return this.isX.apply(this, a); },
-		isOs: function() { var a = Array.prototype.slice.call(arguments); a.unshift('os'); return this.isX.apply(this, a); },
-				
-		isType: function() {
-			var valid = false;
-			for (var a = 0; a < arguments.length; a++) valid = valid || arguments[a] == this.device.type;
-			return valid;
-		},		
-				
-		detect: function(ua) {
-
-			/****************************************************
-			 *		Unix
-			 */
-		
-			if (ua.match('Unix')) {
-				this.os.name = 'Unix';
-			}
-			
-			/****************************************************
-			 *		FreeBSD
-			 */
-		
-			if (ua.match('FreeBSD')) {
-				this.os.name = 'FreeBSD';
-			}
-			
-			/****************************************************
-			 *		OpenBSD
-			 */
-		
-			if (ua.match('OpenBSD')) {
-				this.os.name = 'OpenBSD';
-			}
-			
-			/****************************************************
-			 *		NetBSD
-			 */
-		
-			if (ua.match('NetBSD')) {
-				this.os.name = 'NetBSD';
-			}
-			
-			/****************************************************
-			 *		SunOS
-			 */
-		
-			if (ua.match('SunOS')) {
-				this.os.name = 'Solaris';
-			}
-			
-			/****************************************************
-			 *		Linux
-			 */
-		
-			if (ua.match('Linux')) {
-				this.os.name = 'Linux';
-
-				if (ua.match('CentOS')) {
-					this.os.name = 'CentOS';
-					if (match = /CentOS\/[0-9\.\-]+el([0-9_]+)/.exec(ua)) {
-						this.os.version = new Version({ value: match[1].replace(/_/g,'.') });
-					}
-				}
-
-				if (ua.match('Debian')) {
-					this.os.name = 'Debian';
-				}
-				
-				if (ua.match('Fedora')) {
-					this.os.name = 'Fedora';
-					if (match = /Fedora\/[0-9\.\-]+fc([0-9]+)/.exec(ua)) {
-						this.os.version = new Version({ value: match[1] });
-					}
-				}
-
-				if (ua.match('Gentoo')) {
-					this.os.name = 'Gentoo';
-				}
-				
-				if (ua.match('Kubuntu')) {
-					this.os.name = 'Kubuntu';
-				}
-				
-				if (ua.match('Mandriva Linux')) {
-					this.os.name = 'Mandriva';
-					if (match = /Mandriva Linux\/[0-9\.\-]+mdv([0-9]+)/.exec(ua)) {
-						this.os.version = new Version({ value: match[1] });
-					}
-				}
-
-				if (ua.match('Mageia')) {
-					this.os.name = 'Mageia';
-					if (match = /Mageia\/[0-9\.\-]+mga([0-9]+)/.exec(ua)) {
-						this.os.version = new Version({ value: match[1] });
-					}
-				}
-
-				if (ua.match('Red Hat')) {
-					this.os.name = 'Red Hat';
-					if (match = /Red Hat[^\/]*\/[0-9\.\-]+el([0-9_]+)/.exec(ua)) {
-						this.os.version = new Version({ value: match[1].replace(/_/g,'.') });
-					}
-				}
-
-				if (ua.match('Slackware')) {
-					this.os.name = 'Slackware';
-				}
-				
-				if (ua.match('SUSE')) {
-					this.os.name = 'SUSE';
-				}
-				
-				if (ua.match('Turbolinux')) {
-					this.os.name = 'Turbolinux';
-				}
-				
-				if (ua.match('Ubuntu')) {
-					this.os.name = 'Ubuntu';
-					if (match = /Ubuntu\/([0-9.]*)/.exec(ua)) {
-						this.os.version = new Version({ value: match[1] });
-					}
-				}
-			}		
-
-			/****************************************************
-			 *		iOS
-			 */
-		
-			if (ua.match('iPhone( Simulator)?;') || ua.match('iPad;') || ua.match('iPod;')) {
-				this.os.name = 'iOS';
-				this.os.version = new Version({ value: '1.0'});
-									
-				if (match = /OS (.*) like Mac OS X/.exec(ua)) {
-					this.os.version = new Version({ value: match[1].replace(/_/g,'.') });
-				}					
-				
-				/* 
-					Sometimes Apple releases beta versions that still have the old version number, 
-					but they do have an updated AppleWebKit version. Below are the first version of 
-					iOS in which each version of AppleWebkit is shipped. If the reported version is
-					lower than the version expected from the AppleWebKit version, it is an early beta.
-
-				if (match = /AppleWebKit\/([0-9.]*)/.exec(ua)) {
-					var build = parseVersion(match[1]);
-					if (build >= 420.10) this.result.os.version = Math.max(this.result.os.version, 1.1)		// 1.1
-					if (build >= 525.18) this.result.os.version = Math.max(this.result.os.version, 2.0)		// 2.0
-					if (build >= 528.18) this.result.os.version = Math.max(this.result.os.version, 3.0)		// 3.0 - 3.1
-					if (build >= 531.21) this.result.os.version = Math.max(this.result.os.version, 3.2)		// 3.2
-					if (build >= 532.90) this.result.os.version = Math.max(this.result.os.version, 4.0)		// 4.0 - 4.1
-					if (build >= 533.17) this.result.os.version = Math.max(this.result.os.version, 4.2)		// 4.2 - 4.3
-					if (build >= 534.32) this.result.os.version = Math.max(this.result.os.version, 5.0)		// 5.0
-				}
-				*/
-			
-				if (ua.match('iPhone Simulator;')) {
-					this.device.type = 'emulator';
-				} 
-				else if (ua.match('iPod;')) {
-					this.device.type = 'media';
-					this.device.manufacturer = 'Apple';
-					this.device.model = 'iPod Touch';
-				} 
-				else if (ua.match('iPhone;')) {
-					this.device.type = TYPE_MOBILE;
-					this.device.manufacturer = 'Apple';
-					this.device.model = 'iPhone';
-				} 
-				else {
-					this.device.type = TYPE_TABLET;
-					this.device.manufacturer = 'Apple';
-					this.device.model = 'iPad';
-				}
-				
-				this.device.identified = true;
-			}				
-			
-			/****************************************************
-			 *		MacOS X
-			 */
-		
-			else if (ua.match('Mac OS X')) {
-				this.os.name = 'Mac OS X';
-																			
-				if (match = /Mac OS X (10[0-9\._]*)/.exec(ua)) {
-				    this.os.version = new Version({ value: match[1].replace(/_/g,'.') });
-				}					
-			}
-
-			/****************************************************
-			 *		Windows
-			 */
-		
-			if (ua.match('Windows')) {
-				this.os.name = 'Windows';
-
-				if (match = /Windows NT ([0-9]\.[0-9])/.exec(ua)) {
-					this.os.version = parseVersion(match[1]);
-					
-					switch(match[1]) {
-						case '6.2':		if (ua.match('; ARM;')) 
-											this.os.version = new Version({ value: match[1], alias: 'RT' }); 
-										else
-											this.os.version = new Version({ value: match[1], alias: '8' }); 
-										break;
-										
-						case '6.1':		this.os.version = new Version({ value: match[1], alias: '7' }); break;
-						case '6.0':		this.os.version = new Version({ value: match[1], alias: 'Vista' }); break;
-						case '5.2':		this.os.version = new Version({ value: match[1], alias: 'Server 2003' }); break;
-						case '5.1':		this.os.version = new Version({ value: match[1], alias: 'XP' }); break;
-						case '5.0':		this.os.version = new Version({ value: match[1], alias: '2000' }); break;
-						default:		this.os.version = new Version({ value: match[1], alias: 'NT ' + this.os.version });
-					}
-				}
-				
-				if (ua.match('Windows 95') || ua.match('Win95') || ua.match('Win 9x 4.00')) {
-					this.os.version = new Version({ value: '4.0', alias: '95' });
-				}
-
-				if (ua.match('Windows 98') || ua.match('Win98') || ua.match('Win 9x 4.10')) {
-					this.os.version = new Version({ value: '4.1', alias: '98' });
-				}
-
-				if (ua.match('Windows ME') || ua.match('WinME') || ua.match('Win 9x 4.90')) {
-					this.os.version = new Version({ value: '4.9', alias: 'ME' });
-				}
-
-				if (ua.match('Windows XP') || ua.match('WinXP')) {
-					this.os.name = new Version({ value: '5.1', alias: 'XP' });
-				}
-
-				if (ua.match('WPDesktop')) {
-					this.os.name = 'Windows Phone';
-					this.os.version = new Version({ value: '8.0', details: 2 });
-					this.device.type = TYPE_MOBILE;
-				}
-				
-				if (ua.match('WP7')) {
-					this.os.name = 'Windows Phone';
-					this.os.version = new Version({ value: '7', details: 1 });
-					this.device.type = TYPE_MOBILE;
-					this.browser.mode = 'desktop';
-				}
-
-				if (ua.match('Windows CE') || ua.match('WinCE') || ua.match('WindowsCE')) {
-					if (ua.match(' IEMobile')) {
-						this.os.name = 'Windows Mobile';
-
-						if (ua.match(' IEMobile 8')) {
-							this.os.version = new Version({ value: '6.5', details: 2 });
-						}
-	
-						if (ua.match(' IEMobile 7')) {
-							this.os.version = new Version({ value: '6.1', details: 2 });
-						}
-	
-						if (ua.match(' IEMobile 6')) {
-							this.os.version = new Version({ value: '6.0', details: 2 });
-						}
-					}
-					else {
-						this.os.name = 'Windows CE';
-						
-						if (match = /WindowsCEOS\/([0-9.]*)/.exec(ua)) {
-							this.os.version = new Version({ value: match[1], details: 2 });
-						}
-						
-						if (match = /Windows CE ([0-9.]*)/.exec(ua)) {
-							this.os.version = new Version({ value: match[1], details: 2 });
-						}
-					}
-										
-					this.device.type = TYPE_MOBILE;
-				}
-
-				if (ua.match('Windows Mobile')) {
-					this.os.name = 'Windows Mobile';
-					this.device.type = TYPE_MOBILE;
-				}
-				
-				if (match = /WindowsMobile\/([0-9.]*)/.exec(ua)) {
-					this.os.name = 'Windows Mobile';
-					this.os.version = new Version({ value: match[1], details: 2 });
-					this.device.type = TYPE_MOBILE;
-				}
-				
-				if (match = /Windows Phone ([0-9.]*)/.exec(ua)) {
-					if (parseInt(match[1], 10) < 7) {
-	 					this.os.name = 'Windows Mobile';
-					} else {
-						this.os.name = 'Windows Phone';
-					}
-	
-					this.os.version = new Version({ value: match[1], details: 2 });
-					this.device.type = TYPE_MOBILE;
-				}
-				
-				if (ua.match('Windows Phone')) {
-					this.os.name = 'Windows Phone';
-					this.os.version = new Version({ value: ua.match(/Windows Phone (?:OS )?([0-9.]*)/)[1], details: 2 });
-
-					if (this.os.version < 7) {
-						this.os.name = 'Windows Mobile';
-					}
-
-					if (match = /IEMobile\/[^;]+;(?: ARM; Touch; )?([^;]+); ([^;]+)[;|\)]/.exec(ua)) {
-						this.device = DeviceModels.identify('wp', match[2]);
-						
-						if (!this.device.identified) {
-							this.device.manufacturer = match[1];
-							this.device.model = match[2];
-						}
-					}						
-
-					if (this.device.manufacturer == 'Microsoft' && this.device.model == 'XDeviceEmulator') {
-						this.device.manufacturer = null;
-						this.device.model = null;
-						this.device.type = 'emulator';
-						this.device.identified = true;
-					}
-				}
-			}
-
-			/****************************************************
-			 *		Android
-			 */
-		
-			if (ua.match('Android')) {
-				this.os.name = 'Android';
-				this.os.version = null;
-
-				if (match = /Android(?: )?(?:AllPhone_|CyanogenMod_)?(?:\/)?v?([0-9.]+)/.exec(ua.replace('-update', '.'))) {
-					this.os.version = new Version({ value: match[1], details: 3 })
-				}
-
-				if (match = /Android [0-9][0-9].[0-9][0-9].[0-9][0-9]\(([^)]+)\);/.exec(ua.replace('-update', '.'))) {
-					this.os.version = new Version({ value: match[1], details: 3 })
-				}	
-				
-				if (ua.match('Android Eclair')) {
-					this.os.version = new Version({ value: '2.0', details: 3 });
-				}
-
-				if (this.os.version < 2) {
-					if (ua.match('Build/CUPCAKE')) this.os.version = new Version({ value: 1.5, details: 3 });
-					if (ua.match('Build/DONUT')) this.os.version = new Version({ value: 1.6, details: 3 });
-					if (ua.match('Build/ECLAIR')) this.os.version = new Version({ value: 2.0, details: 3 });
-					if (ua.match('Build/FROYO')) this.os.version = new Version({ value: 2.2, details: 3 });
-					if (ua.match('Build/GINGERBREAD')) this.os.version = new Version({ value: 2.3, details: 3 });
-				}
-					
-
-				this.device.type = TYPE_MOBILE;
-				if (this.os.version >= 3) this.device.type = TYPE_TABLET;
-				if (this.os.version >= 4 && ua.match(TYPE_MOBILE)) this.device.type = TYPE_MOBILE;
-
-				if (match = /Eclair; (?:[a-zA-Z][a-zA-Z](?:[-_][a-zA-Z][a-zA-Z])?) Build\/([^\/]*)\//.exec(ua)) {
-				    this.device.model = match[1];
-				}
-				
-				else if (match = /; ([^;]*[^;\s])\s+Build/.exec(ua)) {
-				    this.device.model = match[1];
-				}		
-				
-				else if (match = /[a-zA-Z][a-zA-Z](?:[-_][a-zA-Z][a-zA-Z])?; ([^;]*[^;\s]);\s+Build/.exec(ua)) {
-				    this.device.model = match[1];
-				}		
-				
-				else if (match = /\(([^;]+);U;Android\/[^;]+;[0-9]+\*[0-9]+;CTC\/2.0\)/.exec(ua)) {
-				    this.device.model = match[1];
-				}		
-				
-				else if (match = /;\s?([^;]+);\s?[0-9]+\*[0-9]+;\s?CTC\/2.0/.exec(ua)) {
-				    this.device.model = match[1];
-				}		
-				
-				else if (match = /Android [^;]+; (?:[a-zA-Z][a-zA-Z](?:[-_][a-zA-Z][a-zA-Z])?; )?([^)]+)\)/.exec(ua)) {
-				    if (! ua.match(/[a-zA-Z][a-zA-Z](?:[-_][a-zA-Z][a-zA-Z])?/)) {
-				    	this.device.model = match[1];
-					}
-				}	
-
-				
-				/* Sometimes we get a model name that starts with Android, in that case it is a mismatch and we should ignore it */
-				if (this.device.model && this.device.model.substring(0,7) == 'Android') {
-					this.device.model = null;
-				}
-				
-				if (this.device.model) {
-					this.device = DeviceModels.identify('android', this.device.model);
-				}
-				
-				if (ua.match('HP eStation'))	{ this.device.manufacturer = 'HP'; this.device.model = 'eStation'; this.device.type = TYPE_TABLET; this.device.identified = true; }
-				if (ua.match('Pre\/1.0')) 		{ this.device.manufacturer = 'Palm'; this.device.model = 'Pre'; this.device.identified = true; }
-				if (ua.match('Pre\/1.1')) 		{ this.device.manufacturer = 'Palm'; this.device.model = 'Pre Plus'; this.device.identified = true; }
-				if (ua.match('Pre\/1.2')) 		{ this.device.manufacturer = 'Palm'; this.device.model = 'Pre 2'; this.device.identified = true; }
-				if (ua.match('Pre\/3.0')) 		{ this.device.manufacturer = 'HP'; this.device.model = 'Pre 3'; this.device.identified = true; }
-				if (ua.match('Pixi\/1.0')) 		{ this.device.manufacturer = 'Palm'; this.device.model = 'Pixi'; this.device.identified = true; }
-				if (ua.match('Pixi\/1.1')) 		{ this.device.manufacturer = 'Palm'; this.device.model = 'Pixi Plus'; this.device.identified = true; }
-				if (ua.match('P160UN?A?\/1.0')) { this.device.manufacturer = 'HP'; this.device.model = 'Veer'; this.device.identified = true; }
-			}
-
-
-
-			/****************************************************
-			 *		Aliyun OS
-			 */
-		
-			if (ua.match('Aliyun')) {
-				this.device.type = TYPE_MOBILE;
-
-				this.os.name = 'Aliyun OS';
-				this.os.version = null;
-
-				if (match = /YunOs ([0-9.]+)/.exec(ua)) {
-					this.os.version = new Version({ value: match[1], details: 3 })
-				}
-
-				if (match = /AliyunOS ([0-9.]+)/.exec(ua)) {
-					this.os.version = new Version({ value: match[1], details: 3 })
-				}
-
-				if (match = /; ([^;]*[^;\s])\s+Build/.exec(ua)) {
-				    this.device.model = match[1];
-				}		
-
-				if (this.device.model) {
-					this.device = DeviceModels.identify('android', this.device.model);
-				}
-			}
-
-			if (ua.match('Android')) {
-				if (match = /Android v(1.[0-9][0-9])_[0-9][0-9].[0-9][0-9]-/.exec(ua)) {
-					this.os.name = 'Aliyun OS';
-					this.os.version = new Version({ value: match[1], details: 3 })
-				}
-	
-				if (match = /Android (1.[0-9].[0-9].[0-9]+)-R?T/.exec(ua)) {
-					this.os.name = 'Aliyun OS';
-					this.os.version = new Version({ value: match[1], details: 3 })
-				}
-			}
-			
-
-
-			/****************************************************
-			 *		Google TV
-			 */
-		
-			if (ua.match('GoogleTV')) {
-				this.os.name = 'Google TV';
-				
-				if (ua.match('Chrome/5.')) {
-					this.os.version = new Version({ value: '1' });
-				}
-
-				if (ua.match('Chrome/11.')) {
-					this.os.version = new Version({ value: '2' });
-				}
-
-				this.device.type = TYPE_TELEVISION;
-			}
-
-			/****************************************************
-			 *		WoPhone
-			 */
-		
-			if (ua.match('WoPhone')) {
-				this.os.name = 'WoPhone';
-																			
-				if (match = /WoPhone\/([0-9\.]*)/.exec(ua)) {
-				    this.os.version = new Version({ value: match[1] });
-				}					
-
-				this.device.type = TYPE_MOBILE;
-			}
-
-			/****************************************************
-			 *		BlackBerry
-			 */
-		
-			if (ua.match('BlackBerry') && !ua.match('BlackBerry Runtime for Android Apps')) {
-				this.os.name = 'BlackBerry OS';
-				
-				if (!ua.match('Opera')) {
-					if (match = /BlackBerry([0-9]*)\/([0-9.]*)/.exec(ua)) {
-						this.device.model = match[1];
-						this.os.version = new Version({ value: match[2], details: 2 });
-					}
-					
-					if (match = /; BlackBerry ([0-9]*);/.exec(ua)) {
-						this.device.model = match[1];
-					}
-
-					if (match = /Version\/([0-9.]*)/.exec(ua)) {
-						this.os.version = new Version({ value: match[1], details: 2 });
-					}
-					
-					if (this.os.version >= 10) {
-						this.os.name = 'BlackBerry';
-					}
-					
-					if (typeof this.device.model != 'undefined') {
-						this.device.model = DeviceModels.identify('blackberry', this.device.model);
-					} else {
-						this.device.model = 'BlackBerry';
-					}
-				} else {
-					this.device.model = 'BlackBerry';
-				}
-
-				this.device.manufacturer = 'RIM';
-				this.device.type = TYPE_MOBILE;
-				this.device.identified = true;
-			}
-			
-			if (match = /\(BB(1[^;]+); ([^\)]+)\)/.exec(ua)) {
-				this.os.name = 'BlackBerry';
-				this.os.version = new Version({ value: match[1], details: 2 });
-
-				this.device.manufacturer = 'RIM';
-				this.device.model = 'BlackBerry ' + match[2];
-				this.device.type = ua.match('Mobile') ? TYPE_MOBILE : TYPE_TABLET;
-				this.device.identified = true;
-
-				if (match = /Version\/([0-9.]*)/.exec(ua)) {
-					this.os.version = new Version({ value: match[1], details: 2 });
-				}
-			}
-				
-			/****************************************************
-			 *		BlackBerry PlayBook
-			 */
-		
-			if (ua.match('RIM Tablet OS')) {
-				this.os.name = 'BlackBerry Tablet OS';
-				this.os.version = new Version({ value: ua.match(/RIM Tablet OS ([0-9.]*)/)[1], details: 2 });
-
-				this.device.manufacturer = 'RIM';
-				this.device.model = 'BlackBerry PlayBook';
-				this.device.type = TYPE_TABLET;
-				this.device.identified = true;
-			}
-
-			else if (ua.match('PlayBook')) {
-				if (match = /Version\/(10[0-9.]*)/.exec(ua)) {
-					this.os.name = 'BlackBerry';
-					this.os.version = new Version({ value: match[1], details: 2 });
-
-					this.device.manufacturer = 'RIM';
-					this.device.model = 'BlackBerry PlayBook';
-					this.device.type = TYPE_TABLET;
-					this.device.identified = true;
-				}
-			}
-
-			/****************************************************
-			 *		WebOS
-			 */
-		
-			if (ua.match('(?:web|hpw)OS')) {
-				this.os.name = 'webOS';
-				this.os.version = new Version({ value: ua.match(/(?:web|hpw)OS\/([0-9.]*)/)[1] });
-
-				if (ua.match(TYPE_TABLET)) 
-					this.device.type = TYPE_TABLET;
-				else
-					this.device.type = TYPE_MOBILE;
-
-				this.device.manufacturer = ua.match('hpwOS') ? 'HP' : 'Palm';
-				if (ua.match('Pre\/1.0')) this.device.model = 'Pre';
-				if (ua.match('Pre\/1.1')) this.device.model = 'Pre Plus';
-				if (ua.match('Pre\/1.2')) this.device.model = 'Pre2';
-				if (ua.match('Pre\/3.0')) this.device.model = 'Pre3';
-				if (ua.match('Pixi\/1.0')) this.device.model = 'Pixi';
-				if (ua.match('Pixi\/1.1')) this.device.model = 'Pixi Plus';
-				if (ua.match('P160UN?A?\/1.0')) this.device.model = 'Veer';
-				if (ua.match('TouchPad\/1.0')) this.device.model = 'TouchPad';
-				
-				if (ua.match('Emulator\/') || ua.match('Desktop\/')) {
-					this.device.type = 'emulator';
-					this.device.manufacturer = null;
-					this.device.model = null;
-				}
-
-				this.device.identified = true;
-			}
-				
-			/****************************************************
-			 *		S60
-			 */
-		
-			if (ua.match('Symbian') || ua.match('Series[ ]?60') || ua.match('S60;')) {
-				this.os.name = 'Series60';
-				
-				if (ua.match('SymbianOS/9.1')  && !ua.match('Series60')) {
-					this.os.version = new Version({ value: '3.0' });
-				}
-							
-				if (match = /Series60\/([0-9.]*)/.exec(ua)) {
-					this.os.version = new Version({ value: match[1] });
-				}
-
-				if (match = /Nokia([^\/;]+)[\/|;]/.exec(ua)) {
-					if (match[1] != 'Browser') {
-						this.device.manufacturer = 'Nokia';
-						this.device.model = match[1];
-						this.device.identified = true;
-					}
-				}
-
-				if (match = /Vertu([^\/;]+)[\/|;]/.exec(ua)) {
-					this.device.manufacturer = 'Vertu';
-					this.device.model = match[1];
-					this.device.identified = true;
-				}
-				
-				if (match = /Symbian; U; ([^;]+); [a-z][a-z]\-[a-z][a-z]/i.exec(ua)) {
-					this.device.manufacturer = 'Nokia';
-					this.device.model = match[1];
-					this.device.identified = true;
-				}
-
-				if (match = /Samsung\/([^;]*);/.exec(ua)) {
-					this.device.manufacturer = STRINGS_SAMSUNG;
-					this.device.model = match[1];
-					this.device.identified = true;
-				}
-
-				this.device.type = TYPE_MOBILE;
-			}
-				
-			/****************************************************
-			 *		S40
-			 */
-		
-			if (ua.match('Series40')) {
-				this.os.name = 'Series40';
-
-				if (match = /Nokia([^\/]+)\//.exec(ua)) {
-					this.device.manufacturer = 'Nokia';
-					this.device.model = match[1];
-					this.device.identified = true;
-				}
-
-				this.device.type = TYPE_MOBILE;
-			}
-			
-			/****************************************************
-			 *		MeeGo
-			 */
-		
-			if (ua.match('MeeGo')) {
-				this.os.name = 'MeeGo';
-				this.device.type = TYPE_MOBILE;
-
-				if (match = /Nokia([^\)]+)\)/.exec(ua)) {
-					this.device.manufacturer = 'Nokia';
-					this.device.model = match[1];
-					this.device.identified = true;
-				}
-			}
-			
-			/****************************************************
-			 *		Maemo
-			 */
-		
-			if (ua.match('Maemo')) {
-				this.os.name = 'Maemo';
-				this.device.type = TYPE_MOBILE;
-
-				if (match = /(N[0-9]+)/.exec(ua)) {
-					this.device.manufacturer = 'Nokia';
-					this.device.model = match[1];
-					this.device.identified = true;
-				}
-			}
-			
-			/****************************************************
-			 *		Tizen
-			 */
-		
-			if (ua.match('Tizen')) {
-				this.os.name = 'Tizen';
-
-				if (match = /Tizen[\/ ]([0-9.]*)/.exec(ua)) {
-					this.os.version = new Version({ value: match[1] });
-				}
-
-				this.device.type = TYPE_MOBILE;
-
-				if (match = /\(([^;]+); ([^\/]+)\//.exec(ua)) {
-					if (match[1] != 'Linux') {
-						this.device = DeviceModels.identify('tizen', match[2]);
-
-						if (!this.device.identified) {
-							this.device.manufacturer = match[1];
-							this.device.model = match[2];
-						}
-					}						
-				}
-			}
-			
-			/****************************************************
-			 *		Bada
-			 */
-		
-			if (ua.match('[b|B]ada')) {
-				this.os.name = 'Bada';
-
-				if (match = /[b|B]ada\/([0-9.]*)/.exec(ua)) {
-					this.os.version = new Version({ value: match[1] });
-				}
-
-				this.device.type = TYPE_MOBILE;
-
-				if (match = /\(([^;]+); ([^\/]+)\//.exec(ua)) {
-					this.device = DeviceModels.identify('bada', match[2]);
-					
-					if (!this.device.identified) {
-					    this.device.manufacturer = match[1];
-					    this.device.model = match[2];
-					}
-				}
-			}
-			
-			/****************************************************
-			 *		Brew
-			 */
-		
-			if (ua.match(/BREW/i) || ua.match('BMP; U')) {
-				this.os.name = 'Brew';
-				this.device.type = TYPE_MOBILE;
-
-				if (match = /BREW; U; ([0-9.]*)/i.exec(ua)) {
-					this.os.version = new Version({ value: match[1] });
-				}
-
-				else if (match = /;BREW\/([0-9.]*)/i.exec(ua)) {
-					this.os.version = new Version({ value: match[1] });
-				}
-
-				
-				if (match = /\(([^;]+);U;REX\/[^;]+;BREW\/[^;]+;(?:.*;)?[0-9]+\*[0-9]+;CTC\/2.0\)/.exec(ua)) {
-					this.device = DeviceModels.identify('brew', match[1]);
-					
-					if (!this.device.identified) {
-					    this.device.model = match[1];
-					}
-				}
-			}			
-			
-			/****************************************************
-			 *		MTK
-			 */
-		
-			if (ua.match(/\(MTK;/)) {
-				this.os.name = 'MTK';
-				this.device.type = TYPE_MOBILE;
-			}			
-
-			/****************************************************
-			 *		CrOS
-			 */
-		
-			if (ua.match('CrOS')) {
-				this.os.name = 'Chrome OS';
-				this.device.type = 'desktop';
-			}			
-			
-			/****************************************************
-			 *		Joli OS
-			 */
-		
-			if (ua.match('Joli OS')) {
-				this.os.name = 'Joli OS';
-				this.device.type = 'desktop';
-
-				if (match = /Joli OS\/([0-9.]*)/i.exec(ua)) {
-					this.os.version = new Version({ value: match[1] });
-				}
-			}			
-			
-			/****************************************************
-			 *		Haiku
-			 */
-		
-			if (ua.match('Haiku')) {
-				this.os.name = 'Haiku';
-				this.device.type = 'desktop';
-			}			
-			
-			/****************************************************
-			 *		QNX
-			 */
-		
-			if (ua.match('QNX')) {
-				this.os.name = 'QNX';
-				this.device.type = TYPE_MOBILE;
-			}			
-			
-			/****************************************************
-			 *		OS/2 Warp
-			 */
-		
-			if (ua.match('OS\/2; Warp')) {
-				this.os.name = 'OS/2 Warp';
-				this.device.type = 'desktop';
-
-				if (match = /OS\/2; Warp ([0-9.]*)/i.exec(ua)) {
-					this.os.version = new Version({ value: match[1] });
-				}
-			}			
-			
-			/****************************************************
-			 *		Grid OS
-			 */
-		
-			if (ua.match('Grid OS')) {
-				this.os.name = 'Grid OS';
-				this.device.type = TYPE_TABLET;
-
-				if (match = /Grid OS ([0-9.]*)/i.exec(ua)) {
-					this.os.version = new Version({ value: match[1] });
-				}
-			}			
-			
-			/****************************************************
-			 *		AmigaOS
-			 */
-		
-			if (ua.match(/AmigaOS/i)) {
-				this.os.name = 'AmigaOS';
-				this.device.type = 'desktop';
-
-				if (match = /AmigaOS ([0-9.]*)/i.exec(ua)) {
-					this.os.version = new Version({ value: match[1] });
-				}
-
-			}			
-			
-			/****************************************************
-			 *		MorphOS
-			 */
-		
-			if (ua.match(/MorphOS/i)) {
-				this.os.name = 'MorphOS';
-				this.device.type = 'desktop';
-
-				if (match = /MorphOS ([0-9.]*)/i.exec(ua)) {
-					this.os.version = new Version({ value: match[1] });
-				}
-
-			}			
-			
-			/****************************************************
-			 *		Kindle
-			 */
-		
-			if (ua.match('Kindle') && ! ua.match('Fire')) {
-				this.os.name = '';
-
-				this.device.manufacturer = 'Amazon';
-				this.device.model = 'Kindle';
-				this.device.type = TYPE_EREADER;
-
-				if (ua.match('Kindle\/2.0')) this.device.model = 'Kindle 2';
-				if (ua.match('Kindle\/3.0')) this.device.model = 'Kindle 3 or later';
-
-				this.device.identified = true;
-			}
-
-			/****************************************************
-			 *		NOOK
-			 */
-		
-			if (ua.match('nook browser')) {
-				this.os.name = 'Android';
-				
-				this.device.manufacturer = 'Barnes & Noble';
-				this.device.model = 'NOOK';
-				this.device.type = TYPE_EREADER;
-				this.device.identified = true;
-			}
-			
-			/****************************************************
-			 *		Bookeen
-			 */
-		
-			if (ua.match('bookeen\/cybook')) {
-				this.os.name = '';
-				
-				this.device.manufacturer = 'Bookeen';
-				this.device.model = 'Cybook';
-				this.device.type = TYPE_EREADER;
-				
-				if (ua.match('Orizon')) {
-					this.device.model = 'Cybook Orizon';
-				}			
-
-				this.device.identified = true;
-			}
-
-			/****************************************************
-			 *		Sony Reader
-			 */
-		
-			if (ua.match('EBRD1101')) {
-				this.os.name = '';
-				
-				this.device.manufacturer = 'Sony';
-				this.device.model = 'Reader';
-				this.device.type = TYPE_EREADER;
-				this.device.identified = true;
-			}
-			
-			/****************************************************
-			 *		iRiver
-			 */
-		
-			if (ua.match('Iriver ;')) {
-				this.os.name = '';
-				
-				this.device.manufacturer = 'iRiver';
-				this.device.model = 'Story';
-				this.device.type = TYPE_EREADER;
-				
-				if (ua.match('EB07')) {
-					this.device.model = 'Story HD EB07';
-				}			
-
-				this.device.identified = true;
-			}
-
-			/****************************************************
-			 *		Nintendo
-			 *
-			 *		Opera/9.30 (Nintendo Wii; U; ; 3642; en)
-			 *		Opera/9.30 (Nintendo Wii; U; ; 2047-7; en)
-			 *		Opera/9.50 (Nintendo DSi; Opera/507; U; en-US)
-			 *		Mozilla/5.0 (Nintendo 3DS; U; ; en) Version/1.7455.US
-			 *		Mozilla/5.0 (Nintendo 3DS; U; ; en) Version/1.7455.EU
-			 *		Mozilla/5.0 (Nintendo WiiU) AppleWebKit/534.52 (KHTML, like Gecko) NX/2.1.0.8.8 Version/1.0.0.6760.JP
-			 */
-		
-			if (ua.match('Nintendo Wii')) {
-				this.os.name = '';
-
-				this.device.manufacturer = 'Nintendo';
-				this.device.model = 'Wii';
-				this.device.type = 'gaming';
-				this.device.identified = true;
-			}
-			
-			if (ua.match('Nintendo Wii ?U')) {
-				this.os.name = '';
-
-				this.device.manufacturer = 'Nintendo';
-				this.device.model = 'Wii U';
-				this.device.type = 'gaming';
-				this.device.identified = true;
-			}
-			
-			if (ua.match('Nintendo DSi')) {
-				this.os.name = '';
-
-				this.device.manufacturer = 'Nintendo';
-				this.device.model = 'DSi';
-				this.device.type = 'gaming';
-				this.device.identified = true;
-			}
-			
-			if (ua.match('Nintendo 3DS')) {
-				this.os.name = '';
-
-				this.device.manufacturer = 'Nintendo';
-				this.device.model = '3DS';
-				this.device.type = 'gaming';
-
-				if (match = /Version\/([0-9.]*)/.exec(ua)) {
-					this.os.version = new Version({ value: match[1] });
-				}
-
-				this.device.identified = true;
-			}
-
-			/****************************************************
-			 *		Sony Playstation
-			 *
-			 *		Mozilla/4.0 (PSP (PlayStation Portable); 2.00)
-			 *
-			 *		Mozilla/5.0 (PlayStation Vita 1.00) AppleWebKit/531.22.8 (KHTML, like Gecko) Silk/3.2
-			 *		Mozilla/5.0 (PlayStation Vita 1.50) AppleWebKit/531.22.8 (KHTML, like Gecko) Silk/3.2
-			 *		Mozilla/5.0 (PlayStation Vita 1.51) AppleWebKit/531.22.8 (KHTML, like Gecko) Silk/3.2
-			 *		Mozilla/5.0 (PlayStation Vita 1.52) AppleWebKit/531.22.8 (KHTML, like Gecko) Silk/3.2
-			 *		Mozilla/5.0 (PlayStation Vita 1.60) AppleWebKit/531.22.8 (KHTML, like Gecko) Silk/3.2
-			 *		Mozilla/5.0 (PlayStation Vita 1.61) AppleWebKit/531.22.8 (KHTML, like Gecko) Silk/3.2
-			 *		Mozilla/5.0 (PlayStation Vita 1.80) AppleWebKit/531.22.8 (KHTML, like Gecko) Silk/3.2
-			 *
-			 *		Mozilla/5.0 (PLAYSTATION 3; 1.00)
-			 *		Mozilla/5.0 (PLAYSTATION 3; 2.00)
-			 *		Mozilla/5.0 (PLAYSTATION 3; 3.55)
-			 *		Mozilla/5.0 (PLAYSTATION 3 4.11) AppleWebKit/531.22.8 (KHTML, like Gecko)
-			 *		Mozilla/5.0 (PLAYSTATION 3 4.10) AppleWebKit/531.22.8 (KHTML, like Gecko)
-			 *
-			 *		Mozilla/5.0 (PlayStation 3) SonyComputerEntertainmentEurope/531.3 (NCell) NuantiMeta/2.0
-			 */
-		
-			if (ua.match('PlayStation Portable')) {
-				this.os.name = '';
-
-				this.device.manufacturer = 'Sony';
-				this.device.model = 'Playstation Portable';
-				this.device.type = 'gaming';
-				this.device.identified = true;
-			}
-
-			if (ua.match('PlayStation Vita')) {
-				this.os.name = '';
-
-				if (match = /PlayStation Vita ([0-9.]*)/.exec(ua)) {
-					this.os.version = new Version({ value: match[1] });
-				}
-
-				this.device.manufacturer = 'Sony';
-				this.device.model = 'PlayStation Vita';
-				this.device.type = 'gaming';
-				this.device.identified = true;
-			}
-
-			if (ua.match(/PlayStation 3/i)) {
-				this.os.name = '';
-
-				if (match = /PLAYSTATION 3;? ([0-9.]*)/.exec(ua)) {
-					this.os.version = new Version({ value: match[1] });
-				}
-
-				this.device.manufacturer = 'Sony';
-				this.device.model = 'Playstation 3';
-				this.device.type = 'gaming';
-				this.device.identified = true;
-			}
-
-
-			/****************************************************
-			 *		XBox
-			 *
-			 *		Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0; Xbox)
-			 */
-		
-			if (ua.match(/Xbox\)$/)) {
-				this.os.name = '';
-				this.os.version = null;
-
-				this.device.manufacturer = 'Microsoft';
-				this.device.model = 'Xbox 360';
-				this.device.type = 'gaming';
-				this.device.identified = true;
-			}
-
-
-
-			/****************************************************
-			 *		Panasonic Smart Viera
-			 *
-			 *		Mozilla/5.0 (FreeBSD; U; Viera; ja-JP) AppleWebKit/535.1 (KHTML, like Gecko) Viera/1.2.4 Chrome/14.0.835.202 Safari/535.1
-			 */
-		
-			if (ua.match('Viera')) {
-				this.os.name = '';
-				this.device.manufacturer = 'Panasonic';
-				this.device.model = 'Smart Viera';
-				this.device.type = TYPE_TELEVISION;
-				this.device.identified = true;
-			}
-
-
-			/****************************************************
-			 *		Sharp AQUOS TV
-			 *
-			 *		Mozilla/5.0 (DTV) AppleWebKit/531.2  (KHTML, like Gecko) AQUOSBrowser/1.0 (US00DTV;V;0001;0001)
-			 *		Mozilla/5.0 (DTV) AppleWebKit/531.2+ (KHTML, like Gecko) Espial/6.0.4 AQUOSBrowser/1.0 (CH00DTV;V;0001;0001)
-			 *		Opera/9.80 (Linux armv6l; U; en) Presto/2.8.115 Version/11.10 AQUOS-AS/1.0 LC-40LE835X
-			 */
-		
-			if (ua.match('AQUOSBrowser') || ua.match('AQUOS-AS')) {
-				this.os.name = '';
-				this.device.manufacturer = STRINGS_SHARP;
-				this.device.model = 'Aquos TV';
-				this.device.type = TYPE_TELEVISION;
-				this.device.identified = true;
-			}
-
-
-			/****************************************************
-			 *		Samsung Smart TV
-			 *
-			 *		Mozilla/5.0 (SmartHub; SMART-TV; U; Linux/SmartTV; Maple2012) AppleWebKit/534.7 (KHTML, like Gecko) SmartTV Safari/534.7
-			 *		Mozilla/5.0 (SmartHub; SMART-TV; U; Linux/SmartTV) AppleWebKit/531.2+ (KHTML, like Gecko) WebBrowser/1.0 SmartTV Safari/531.2+
-			 */
-
-			if (ua.match('SMART-TV')) {
-				this.os.name = '';
-				this.device.manufacturer = STRINGS_SAMSUNG;
-				this.device.model = 'Smart TV';
-				this.device.type = TYPE_TELEVISION;
-				this.device.identified = true;
-
-				if (match = /Maple([0-9]*)/.exec(ua)) {
-					this.device.model += ' ' + match[1]; 
-				}
-			}
-
-			/****************************************************
-			 *		Sony Internet TV
-			 *
-			 *		Opera/9.80 (Linux armv7l; U; InettvBrowser/2.2(00014A;SonyDTV115;0002;0100) KDL-46EX640; CC/USA; en) Presto/2.8.115 Version/11.10
-			 *		Opera/9.80 (Linux armv7l; U; InettvBrowser/2.2(00014A;SonyDTV115;0002;0100) KDL-40EX640; CC/USA; en) Presto/2.10.250 Version/11.60
-			 *		Opera/9.80 (Linux armv7l; U; InettvBrowser/2.2(00014A;SonyDTV115;0002;0100) N/A; CC/USA; en) Presto/2.8.115 Version/11.10
-			 *		Opera/9.80 (Linux mips; U; InettvBrowser/2.2 (00014A;SonyDTV115;0002;0100) ; CC/JPN; en) Presto/2.9.167 Version/11.50
-			 *		Opera/9.80 (Linux mips; U; InettvBrowser/2.2 (00014A;SonyDTV115;0002;0100) AZ2CVT2; CC/CAN; en) Presto/2.7.61 Version/11.00
-			 *		Opera/9.80 (Linux armv6l; Opera TV Store/4207; U; (SonyBDP/BDV11); en) Presto/2.9.167 Version/11.50
-			 *		Opera/9.80 (Linux armv6l ; U; (SonyBDP/BDV11); en) Presto/2.6.33 Version/10.60
-			 *		Opera/9.80 (Linux armv6l; U; (SonyBDP/BDV11); en) Presto/2.8.115 Version/11.10
-			 */
-
-			if (ua.match('SonyDTV|SonyBDP|SonyCEBrowser')) {
-				this.os.name = '';
-				this.device.manufacturer = 'Sony';
-				this.device.model = 'Internet TV';
-				this.device.type = TYPE_TELEVISION;
-				this.device.identified = true;
-			}
-
-			/****************************************************
-			 *		Philips Net TV
-			 *
-			 *		Opera/9.70 (Linux armv6l ; U; CE-HTML/1.0 NETTV/2.0.2; en) Presto/2.2.1
-			 *		Opera/9.80 (Linux armv6l ; U; CE-HTML/1.0 NETTV/3.0.1;; en) Presto/2.6.33 Version/10.60
-			 *		Opera/9.80 (Linux mips; U; CE-HTML/1.0 NETTV/3.0.1; PHILIPS-AVM-2012; en) Presto/2.9.167 Version/11.50
-			 *		Opera/9.80 (Linux mips ; U; HbbTV/1.1.1 (; Philips; ; ; ; ) CE-HTML/1.0 NETTV/3.1.0; en) Presto/2.6.33 Version/10.70
-			 *		Opera/9.80 (Linux i686; U; HbbTV/1.1.1 (; Philips; ; ; ; ) CE-HTML/1.0 NETTV/3.1.0; en) Presto/2.9.167 Version/11.50
-			 */
-
-			if (ua.match('NETTV\/')) {
-				this.os.name = '';
-				this.device.manufacturer = 'Philips';
-				this.device.model = 'Net TV';
-				this.device.type = TYPE_TELEVISION;
-				this.device.identified = true;
-			}
-			
-			/****************************************************
-			 *		LG NetCast TV
-			 *
-			 *		Mozilla/5.0 (DirectFB; Linux armv7l) AppleWebKit/534.26+ (KHTML, like Gecko) Version/5.0 Safari/534.26+ LG Browser/5.00.00(+mouse+3D+SCREEN+TUNER; LGE; GLOBAL-PLAT4; 03.09.22; 0x00000001;); LG NetCast.TV-2012
-			 *		Mozilla/5.0 (DirectFB; Linux armv7l) AppleWebKit/534.26+ (KHTML, like Gecko) Version/5.0 Safari/534.26+ LG Browser/5.00.00(+SCREEN+TUNER; LGE; GLOBAL-PLAT4; 01.00.00; 0x00000001;); LG NetCast.TV-2012
-			 *		Mozilla/5.0 (DirectFB; U; Linux armv6l; en) AppleWebKit/531.2  (KHTML, like Gecko) Safari/531.2  LG Browser/4.1.4( BDP; LGE; Media/BD660; 6970; abc;); LG NetCast.Media-2011
-			 *		Mozilla/5.0 (DirectFB; U; Linux 7631; en) AppleWebKit/531.2  (KHTML, like Gecko) Safari/531.2  LG Browser/4.1.4( NO_NUM; LGE; Media/SP520; ST.3.97.409.F; 0x00000001;); LG NetCast.Media-2011
-			 *		Mozilla/5.0 (DirectFB; U; Linux 7630; en) AppleWebKit/531.2  (KHTML, like Gecko) Safari/531.2  LG Browser/4.1.4( 3D BDP NO_NUM; LGE; Media/ST600; LG NetCast.Media-2011
-			 *		(LGSmartTV/1.0) AppleWebKit/534.23 OBIGO-T10/2.0
-			 */
-
-			if (match = /LG NetCast\.(?:TV|Media)-([0-9]*)/.exec(ua)) {
-				this.os.name = '';
-				this.device.manufacturer = STRINGS_LG;
-				this.device.model = 'NetCast TV ' + match[1];
-				this.device.type = TYPE_TELEVISION;
-				this.device.identified = true;
-			}
-
-			if (match = /LGSmartTV/.exec(ua)) {
-				this.os.name = '';
-				this.device.manufacturer = STRINGS_LG;
-				this.device.model = 'Smart TV';
-				this.device.type = TYPE_TELEVISION;
-				this.device.identified = true;
-			}
-			
-			/****************************************************
-			 *		Toshiba Smart TV
-			 *
-			 *		Mozilla/5.0 (Linux mipsel; U; HbbTV/1.1.1 (; TOSHIBA; DTV_RL953; 56.7.66.7; t12; ) ; ToshibaTP/1.3.0 (+VIDEO_MP4+VIDEO_X_MS_ASF+AUDIO_MPEG+AUDIO_MP4+DRM+NATIVELAUNCH) ; en) AppleWebKit/534.1 (KHTML, like Gecko)
-			 *		Mozilla/5.0 (DTV; TSBNetTV/T32013713.0203.7DD; TVwithVideoPlayer; like Gecko) NetFront/4.1 DTVNetBrowser/2.2 (000039;T32013713;0203;7DD) InettvBrowser/2.2 (000039;T32013713;0203;7DD)
-			 *		Mozilla/5.0 (Linux mipsel; U; HbbTV/1.1.1 (; TOSHIBA; 40PX200; 0.7.3.0.; t12; ) ; Toshiba_TP/1.3.0 (+VIDEO_MP4+AUDIO_MPEG+AUDIO_MP4+VIDEO_X_MS_ASF+OFFLINEAPP) ; en) AppleWebKit/534.1 (KHTML, like Gec
-			 */
-
-			if (ua.match('Toshiba_?TP\/') || ua.match('TSBNetTV\/')) {
-				this.os.name = '';
-				this.device.manufacturer = 'Toshiba';
-				this.device.model = 'Smart TV';
-				this.device.type = TYPE_TELEVISION;
-				this.device.identified = true;
-			}
-			
-			/****************************************************
-			 *		NetRange MMH 
-			 */
-
-			if (ua.match('NETRANGEMMH')) {
-				this.os.name = '';
-				this.os.version = null;
-				this.browser.name = '';
-				this.browser.version = null;
-				this.device.model = 'NetRange MMH';
-				this.device.type = TYPE_TELEVISION;
-				this.device.identified = true;
-			}
-
-			/****************************************************
-			 *		MachBlue XT
-			 */
-
-			if (match = /mbxtWebKit\/([0-9.]*)/.exec(ua)) {
-				this.os.name = '';
-				this.browser.name = 'MachBlue XT'
-				this.browser.version = new Version({ value: match[1], details: 2 });
-				this.device.type = TYPE_TELEVISION;
-			}
-
-			if (ua == 'MachBlue') {
-				this.os.name = '';
-				this.browser.name = 'MachBlue XT'
-				this.device.type = TYPE_TELEVISION;
-			}
-
-			
-
-			/****************************************************
-			 *		Motorola KreaTV
-			 */
-
-			if (match = /Motorola KreaTV STB/.exec(ua)) {
-				this.os.name = '';
-				this.device.manufacturer = STRINGS_MOTOROLA;
-				this.device.model = 'KreaTV';
-				this.device.type = TYPE_TELEVISION;
-				this.device.identified = true;
-			}
-
-			/****************************************************
-			 *		ADB
-			 */
-
-			if (match = /\(ADB; ([^\)]+)\)/.exec(ua)) {
-				this.os.name = '';
-				this.device.manufacturer = 'ADB';
-				this.device.model = (match[1] != 'Unknown' ? match[1].replace('ADB','') + ' ' : '') + 'IPTV receiver';
-				this.device.type = TYPE_TELEVISION;
-				this.device.identified = true;
-			}
-
-			/****************************************************
-			 *		MStar
-			 */
-
-			if (ua.match(/Mstar;OWB/)) {
-				this.os.name = '';
-				this.device.manufacturer = 'MStar';
-				this.device.model = 'PVR';
-				this.device.type = TYPE_TELEVISION;
-				this.device.identified = true;
-				
-				this.browser.name = 'Origyn Web Browser';
-			}
-			
-			/****************************************************
-			 *		TechniSat
-			 */
-
-			if (match = /\TechniSat ([^;]+);/.exec(ua)) {
-				this.os.name = '';
-				this.device.manufacturer = 'TechniSat';
-				this.device.model = match[1];
-				this.device.type = TYPE_TELEVISION;
-				this.device.identified = true;
-			}
-			
-			/****************************************************
-			 *		Technicolor
-			 */
-
-			if (match = /\Technicolor_([^;]+);/.exec(ua)) {
-				this.os.name = '';
-				this.device.manufacturer = 'Technicolor';
-				this.device.model = match[1];
-				this.device.type = TYPE_TELEVISION;
-				this.device.identified = true;
-			}
-			
-			/****************************************************
-			 *		Winbox Evo2
-			 */
-
-			if (match = /Winbox Evo2/.exec(ua)) {
-				this.os.name = '';
-				this.device.manufacturer = 'Winbox';
-				this.device.model = 'Evo2';
-				this.device.type = TYPE_TELEVISION;
-				this.device.identified = true;
-			}
-			
-			/****************************************************
-			 *		Roku
-			 */
-
-			if (match = /^Roku\/DVP-([0-9]+)/.exec(ua)) {
-				this.device.manufacturer = 'Roku';
-				this.device.type = TYPE_TELEVISION;
-				
-				switch (match[1]) {
-					case '2000':	this.device.model = 'HD'; break;
-					case '2050':	this.device.model = 'XD'; break;
-					case '2100':	this.device.model = 'XDS'; break;
-					case '2400':	this.device.model = 'LT'; break;
-					case '3000':	this.device.model = '2 HD'; break;
-					case '3050':	this.device.model = '2 XD'; break;
-					case '3100':	this.device.model = '2 XS'; break;
-				}
-
-				this.device.identified = true;
-			}
-			
-			if (match = /HbbTV\/1.1.1 \([^;]*;\s*([^;]*)\s*;\s*([^;]*)\s*;/.exec(ua)) {
-				var vendorName = match[1].trim();
-				var modelName = match[2].trim();
-				
-				if (!this.device.manufacturer && vendorName != '' && vendorName != 'vendorName') {
-					switch(vendorName) {
-						case 'LG Electronics':	this.device.manufacturer = 'LG'; break;
-						case 'LGE':				this.device.manufacturer = 'LG'; break;
-						case 'TOSHIBA':			this.device.manufacturer = 'Toshiba'; break;
-						case 'smart':			this.device.manufacturer = 'Smart'; break;
-						case 'tv2n':			this.device.manufacturer = 'TV2N'; break;
-						default:				this.device.manufacturer = vendorName;
-					}
-
-					if (!this.device.model && modelName != '' && modelName != 'modelName') {
-						switch(modelName) {
-							case 'GLOBAL_PLAT3':	this.device.model = 'NetCast TV'; break;
-							case 'GLOBAL_PLAT4':	this.device.model = 'NetCast TV'; break;
-							case 'SmartTV2012':		this.device.model = 'Smart TV 2012'; break;
-							case 'videoweb':		this.device.model = 'Videoweb'; break;
-							default:				this.device.model = modelName;
-						}
-						
-						if (vendorName == 'Humax') {
-							this.device.model = this.device.model.toUpperCase();
-						}
-	
-						this.device.identified = true;
-						this.os.name = '';
-					}
-				}
-
-				this.device.type = TYPE_TELEVISION;
-			}
-			
-			/****************************************************
-			 *		Detect type based on common identifiers
-			 */
-
-			if (ua.match('InettvBrowser')) {
-				this.device.type = TYPE_TELEVISION;
-			}
-
-			if (ua.match('MIDP')) {
-				this.device.type = TYPE_MOBILE;
-			}
-			
-			/****************************************************
-			 *		Try to detect any devices based on common
-			 *		locations of model ids
-			 */
-
-			if (!this.device.model && !this.device.manufacturer) {
-				var candidates = [];
-			
-				if (!ua.match(/^(Mozilla|Opera)/)) if (match = /^(?:MQQBrowser\/[0-9\.]+\/)?([^\s]+)/.exec(ua)) {
-					match[1] = match[1].replace(/_TD$/, '');
-					match[1] = match[1].replace(/_CMCC$/, '');
-					match[1] = match[1].replace(/[_ ]Mozilla$/, '');
-					match[1] = match[1].replace(/ Linux$/, '');
-					match[1] = match[1].replace(/ Opera$/, '');
-					match[1] = match[1].replace(/\/[0-9].*$/, '');
-					
-					candidates.push(match[1]);
-				}
-			
-				if (match = /[0-9]+x[0-9]+; ([^;]+)/.exec(ua)) {
-					candidates.push(match[1]);
-				}
-			
-				if (match = /[0-9]+X[0-9]+ ([^;\/\(\)]+)/.exec(ua)) {
-					candidates.push(match[1]);
-				}
-
-				if (match = /Windows NT 5.1; ([^;]+); Windows Phone/.exec(ua)) {
-					candidates.push(match[1]);
-				}
-
-				if (match = /\) PPC; (?:[0-9]+x[0-9]+; )?([^;\/\(\)]+)/.exec(ua)) {
-					candidates.push(match[1]);
-				}
-
-				if (match = /\(([^;]+); U; Windows Mobile/.exec(ua)) {
-					candidates.push(match[1]);
-				}
-
-				if (match = /Vodafone\/1.0\/([^\/]+)/.exec(ua)) {
-					candidates.push(match[1]);
-				}
-
-				if (match = /\ ([^\s]+)$/.exec(ua)) {
-					candidates.push(match[1]);
-				}
-				
-				if (match = /^([a-z0-9\.\_\+\/ ]+) Linux/i.exec(ua)) {
-					candidates.push(match[1]);
-				}
-				
-				for (var i = 0; i < candidates.length; i++) {
-					if (!this.device.model && !this.device.manufacturer) {
-						var result = false;
-						
-						if (this.os.name == 'Android') {
-							var device = DeviceModels.identify('android', candidates[i]);
-							if (device.identified) {
-								result = true;
-
-								this.device = device;
-							}
-						}
-	
-						if (!this.os.name || this.os.name == 'Windows' || this.os.name == 'Windows Mobile' || this.os.name == 'Windows CE') {
-							var device = DeviceModels.identify('wm', candidates[i]);
-							if (device.identified) {
-								result = true;
-
-								this.device = device;
-
-								if (this.os.name != 'Windows Mobile') {
-									this.os.name = 'Windows Mobile';
-									this.os.version = null;
-								}
-							}
-						}
-					}
-	
-					if (!result) {
-						if (match = /^GIONEE-([^\s]+)/.exec(candidates[i])) {
-							this.device.manufacturer = 'Gionee';
-							this.device.model = DeviceModels.cleanup(match[1]);
-							this.device.type = TYPE_MOBILE;
-							this.device.identified = true;
-						}
-						
-						if (match = /^HTC_?([^\/_]+)(?:\/|_|$)/.exec(candidates[i])) {
-							this.device.manufacturer = STRINGS_HTC;
-							this.device.model = DeviceModels.cleanup(match[1]);
-							this.device.type = TYPE_MOBILE;
-							this.device.identified = true;
-						}
-						
-						if (match = /^HUAWEI-([^\/]*)/.exec(candidates[i])) {
-							this.device.manufacturer = STRINGS_HUAWEI;
-							this.device.model = DeviceModels.cleanup(match[1]);
-							this.device.type = TYPE_MOBILE;
-							this.device.identified = true;
-						}
-		
-						if (match = /(?:^|\()LGE?(?:\/|-|_|\s)([^\s]*)/.exec(candidates[i])) {
-							this.device.manufacturer = STRINGS_LG;
-							this.device.model = DeviceModels.cleanup(match[1]);
-							this.device.type = TYPE_MOBILE;
-							this.device.identified = true;
-						}
-		
-						if (match = /^MOT-([^\/_]+)(?:\/|_|$)/.exec(candidates[i])) {
-							this.device.manufacturer = STRINGS_MOTOROLA;
-							this.device.model = DeviceModels.cleanup(match[1]);
-							this.device.type = TYPE_MOBILE;
-							this.device.identified = true;
-						}
-		
-						if (match = /^Motorola_([^\/_]+)(?:\/|_|$)/.exec(candidates[i])) {
-							this.device.manufacturer = STRINGS_MOTOROLA;
-							this.device.model = DeviceModels.cleanup(match[1]);
-							this.device.type = TYPE_MOBILE;
-							this.device.identified = true;
-						}
-		
-						if (match = /^Nokia([^\/]+)(?:\/|$)/.exec(candidates[i])) {
-							this.device.manufacturer = 'Nokia';
-							this.device.model = DeviceModels.cleanup(match[1]);
-							this.device.type = TYPE_MOBILE;
-							this.device.identified = true;
-							
-							if (!this.os.name) {
-								this.os.name = 'Series40';
-							}
-						}
-
-						if (match = /^Pantech([^\/_]+)(?:\/|_|$)/.exec(candidates[i])) {
-							this.device.manufacturer = 'Pantech';
-							this.device.model = DeviceModels.cleanup(match[1]);
-							this.device.type = TYPE_MOBILE;
-							this.device.identified = true;
-						}
-		
-						if (match = /^SonyEricsson([^\/_]+)(?:\/|_|$)/.exec(candidates[i])) {
-							this.device.manufacturer = STRINGS_SONY_ERICSSON;
-							this.device.model = DeviceModels.cleanup(match[1]);
-							this.device.type = TYPE_MOBILE;
-							this.device.identified = true;
-						}
-		
-						if (match = /^SAMSUNG-([^\/_]+)(?:\/|_|$)/.exec(candidates[i])) {
-							this.device.manufacturer = STRINGS_SAMSUNG;
-							this.device.model = match[1];
-							this.device.type = TYPE_MOBILE;
-							
-							if (this.os.name == 'Bada') {
-								this.device = DeviceModels.identify('bada', this.device.model);
-							}
-							
-							else if (match = /Jasmine\/([0-9.]*)/.exec(ua)) {
-								var version = match[1];
-								
-								this.device = DeviceModels.identify('touchwiz', this.device.model);
-								if (this.device.identified) {
-									this.os.name = 'Touchwiz';
-									this.os.version = new Version({ value: '2.0' });
-								}
-							}
-				
-							else if (match = /Dolfin\/([0-9.]*)/.exec(ua)) {
-								this.device = DeviceModels.identify('bada', this.device.model);
-								if (this.device.identified) {
-									this.os.name = 'Bada';
-									
-									switch(version) {
-										case '2.0':		this.os.version = new Version({ value: '1.0' }); break;						
-										case '2.2':		this.os.version = new Version({ value: '1.2' }); break;							
-										case '3.0':		this.os.version = new Version({ value: '2.0' }); break;					
-									}	
-								}
-								
-								else {
-									this.device = DeviceModels.identify('touchwiz', this.device.model);
-									if (this.device.identified) {
-										this.os.name = 'Touchwiz';
-			
-										switch(version) {
-											case '1.0':		this.os.version = new Version({ value: '1.0' }); break;						
-											case '1.5':		this.os.version = new Version({ value: '2.0' }); break;							
-											case '2.0':		this.os.version = new Version({ value: '3.0' }); break;					
-										}	
-									}
-								}
-							}
-							
-							if (!this.device.identified) {
-								this.device.model = DeviceModels.cleanup(this.device.model);
-							}
-						}
-					}
-				}
-			}
-			
-
-			if (match = /\((?:LG[-|\/])(.*) (?:Browser\/)?AppleWebkit/.exec(ua)) {
-				this.device.manufacturer = STRINGS_LG;
-				this.device.model = match[1];
-				this.device.type = TYPE_MOBILE;
-				this.device.identified = true;
-			}
-
-			if (match = /^Mozilla\/5.0 \((?:Nokia|NOKIA)(?:\s?)([^\)]+)\)UC AppleWebkit\(like Gecko\) Safari\/530$/.exec(ua)) {
-				this.device.manufacturer = 'Nokia';
-				this.device.model = match[1];
-				this.device.type = TYPE_MOBILE;
-				this.device.identified = true;
-				
-				this.os.name = 'Series60';
-			}
-
-
-
-
-
-			/****************************************************
-			 *		Safari
-			 */
-		
-			if (ua.match('Safari')) {
-				if (this.os.name == 'iOS') {
-					this.browser.stock = true;
-					this.browser.hidden = true;
-					this.browser.name = 'Safari';
-					this.browser.version = null;
-				}
-				
-				if (this.os.name == 'Mac OS X' || this.os.name == 'Windows') {
-					this.browser.name = 'Safari';
-					this.browser.stock = this.os.name == 'Mac OS X';
-
-					if (match = /Version\/([0-9\.]+)/.exec(ua)) {
-						this.browser.version = new Version({ value: match[1] });
-					}		
-
-					if (ua.match(/AppleWebKit\/[0-9\.]+\+/)) {
-						this.browser.name = 'WebKit Nightly Build';
-						this.browser.version = null;
-					}
-				}
-			}
-
-			/****************************************************
-			 *		Internet Explorer
-			 */
-		
-			if (ua.match('MSIE')) {
-				this.browser.name = 'Internet Explorer';
-				
-				if (ua.match('IEMobile') || ua.match('Windows CE') || ua.match('Windows Phone') || ua.match('WP7') || ua.match('WPDesktop')) {
-					this.browser.name = 'Mobile Internet Explorer';
-				}
-
-				if (match = /MSIE ([0-9.]*)/.exec(ua)) {
-					this.browser.version = new Version({ value: match[1] });
-				}
-			}
-
-			/****************************************************
-			 *		Opera
-			 */
-		
-			if (ua.match(/Opera/i)) {
-				this.browser.stock = false;
-				this.browser.name = 'Opera';
-
-				if (match = /Opera[\/| ]([0-9.]*)/.exec(ua)) {
-					this.browser.version = new Version({ value: match[1] });
-				}
-
-				if (match = /Version\/([0-9.]*)/.exec(ua)) {
-					if (parseFloat(match[1]) >= 10) {
-						this.browser.version = new Version({ value: match[1] });
-					} else {
-						this.browser.version = null;
-					}
-				}
-				
-				if (this.browser.version && ua.match('Edition Labs')) {
-					this.browser.channel = 'Labs';
-				}
-				
-				if (this.browser.version && ua.match('Edition Next')) {
-					this.browser.channel = 'Next';
-				}
-				
-				if (ua.match('Opera Tablet')) {
-					this.browser.name = 'Opera Mobile';
-					this.device.type = TYPE_TABLET;
-				}
-				
-				if (ua.match('Opera Mobi')) {
-					this.browser.name = 'Opera Mobile';
-					this.device.type = TYPE_MOBILE;
-				}
-
-				if (match = /Opera Mini;/.exec(ua)) {
-					this.browser.name = 'Opera Mini';
-					this.browser.version = null;
-					this.browser.mode = 'proxy';
-					this.device.type = TYPE_MOBILE;
-				}
-				
-				if (match = /Opera Mini\/(?:att\/)?([0-9.]*)/.exec(ua)) {
-					this.browser.name = 'Opera Mini';
-					this.browser.version = new Version({ value: match[1], details: -1 });
-					this.browser.mode = 'proxy';
-					this.device.type = TYPE_MOBILE;
-				}
-				
-				if (this.browser.name == 'Opera' && this.device.type == TYPE_MOBILE) {
-					this.browser.name = 'Opera Mobile';
-					
-					if (ua.match(/BER/)) {
-						this.browser.name = 'Opera Mini';
-						this.browser.version = null;
-					}
-				}
-
-				if (ua.match('InettvBrowser')) {
-					this.device.type = TYPE_TELEVISION;
-				}
-
-				if (ua.match('Opera TV') || ua.match('Opera-TV')) {
-					this.browser.name = 'Opera';
-					this.device.type = TYPE_TELEVISION;
-				}
-				
-				if (ua.match('Linux zbov')) {
-					this.browser.name = 'Opera Mobile';
-					this.browser.mode = 'desktop';
-				
-					this.device.type = TYPE_MOBILE;
-
-					this.os.name = null;
-					this.os.version = null;
-				}
-				
-				if (ua.match('Linux zvav')) {
-					this.browser.name = 'Opera Mini';
-					this.browser.version = null;
-					this.browser.mode = 'desktop';
-
-					this.device.type = TYPE_MOBILE;
-				
-					this.os.name = null;
-					this.os.version = null;
-				}
-			}
-
-			/****************************************************
-			 *		Firefox
-			 */
-		
-			if (ua.match('Firefox')) {
-				this.browser.stock = false;
-				this.browser.name = 'Firefox';
-
-				if (match = /Firefox\/([0-9ab.]*)/.exec(ua)) {
-					this.browser.version = new Version({ value: match[1] });
-				}
-				
-				if (this.browser.version.type == 'alpha') {
-					this.browser.channel = 'Aurora';
-				}
-
-				if (this.browser.version.type == 'beta') {
-					this.browser.channel = 'Beta';
-				}
-				
-				if (ua.match('Fennec')) {
-					this.device.type = TYPE_MOBILE;
-				}
-				
-				if (ua.match('Mobile; rv')) {
-					this.device.type = TYPE_MOBILE;
-				}
-
-				if (ua.match('Tablet; rv')) {
-					this.device.type = TYPE_TABLET;
-				}
-				
-				if (this.device.type == TYPE_MOBILE || this.device.type == TYPE_TABLET) {
-					this.browser.name = 'Firefox Mobile';
-				}
-			}
-
-			if (ua.match('Namoroka')) {
-				this.browser.stock = false;
-				this.browser.name = 'Firefox';
-
-				if (match = /Namoroka\/([0-9ab.]*)/.exec(ua)) {
-					this.browser.version = new Version({ value: match[1] });
-				}
-				
-				this.browser.channel = 'Namoroka';
-			}
-
-			if (ua.match('Shiretoko')) {
-				this.browser.stock = false;
-				this.browser.name = 'Firefox';
-
-				if (match = /Shiretoko\/([0-9ab.]*)/.exec(ua)) {
-					this.browser.version = new Version({ value: match[1] });
-				}
-				
-				this.browser.channel = 'Shiretoko';
-			}
-			
-			if (ua.match('Minefield')) {
-				this.browser.stock = false;
-				this.browser.name = 'Firefox';
-
-				if (match = /Minefield\/([0-9ab.]*)/.exec(ua)) {
-					this.browser.version = new Version({ value: match[1] });
-				}
-				
-				this.browser.channel = 'Minefield';
-			}
-			
-			if (ua.match('Firebird')) {
-				this.browser.stock = false;
-				this.browser.name = 'Firebird';
-
-				if (match = /Firebird\/([0-9ab.]*)/.exec(ua)) {
-					this.browser.version = new Version({ value: match[1] });
-				}
-			}
-			
-			/****************************************************
-			 *		SeaMonkey
-			 */
-		
-			if (ua.match('SeaMonkey')) {
-				this.browser.stock = false;
-				this.browser.name = 'SeaMonkey';
-
-				if (match = /SeaMonkey\/([0-9.]*)/.exec(ua)) {
-					this.browser.version = new Version({ value: match[1] });
-				}
-			}
-
-			/****************************************************
-			 *		Netscape
-			 */
-		
-			if (ua.match('Netscape')) {
-				this.browser.stock = false;
-				this.browser.name = 'Netscape';
-
-				if (match = /Netscape[0-9]?\/([0-9.]*)/.exec(ua)) {
-					this.browser.version = new Version({ value: match[1] });
-				}
-			}
-
-			/****************************************************
-			 *		Konqueror
-			 */
-		
-			if (ua.match('[k|K]onqueror/')) {
-				this.browser.name = 'Konqueror';
-
-				if (match = /[k|K]onqueror\/([0-9.]*)/.exec(ua)) {
-					this.browser.version = new Version({ value: match[1] });
-				}
-			}
-
-			/****************************************************
-			 *		Chrome
-			 */
-		
-			if (match = /(?:Chrome|CrMo|CriOS)\/([0-9.]*)/.exec(ua)) {
-				this.browser.stock = false;
-				this.browser.name = 'Chrome';
-				this.browser.version = new Version({ value: match[1] });
-
-				if (this.os.name == 'Android') {
-					switch (match[1].split('.', 3).join('.')) {
-						case '16.0.912':
-							this.browser.channel = 'Beta';
-							break;
-						case '18.0.1025':
-							this.browser.version.details = 1;
-							break;
-						default:	
-							this.browser.channel = 'Nightly';
-							break;
-					}
-				}
-								
-				else {
-					switch (match[1].split('.', 3).join('.')) {
-						case '0.2.149':
-						case '0.3.154':
-						case '0.4.154':
-						case '1.0.154':
-						case '2.0.172':
-						case '3.0.195':
-						case '4.0.249':
-						case '4.1.249':
-						case '5.0.375':
-						case '6.0.472':
-						case '7.0.517':
-						case '8.0.552':
-						case '9.0.597':
-						case '10.0.648':
-						case '11.0.696':
-						case '12.0.742':
-						case '13.0.782':
-						case '14.0.835':
-						case '15.0.874':
-						case '16.0.912':
-						case '17.0.963':
-						case '18.0.1025':
-						case '19.0.1084':
-						case '20.0.1132':
-						case '21.0.1180':
-						case '22.0.1229':
-							if (this.browser.version.minor == 0) 
-								this.browser.version.details = 1;
-							else
-								this.browser.version.details = 2;
-								
-							break;
-						default:	
-							this.browser.channel = 'Nightly';
-							break;
-					}
-				}
-			}
-			
-			/****************************************************
-			 *		Chrome Frame
-			 */
-		
-			if (ua.match('chromeframe')) {
-				this.browser.stock = false;
-				this.browser.name = 'Chrome Frame';
-
-				if (match = /chromeframe\/([0-9.]*)/.exec(ua)) {
-					this.browser.version = new Version({ value: match[1] });
-				}
-			}
-
-			/****************************************************
-			 *		Chromium
-			 */
-		
-			if (ua.match('Chromium')) {
-				this.browser.stock = false;
-				this.browser.channel = '';
-				this.browser.name = 'Chromium';
-
-				if (match = /Chromium\/([0-9.]*)/.exec(ua)) {
-					this.browser.version = new Version({ value: match[1] });
-				}
-			}
-
-			/****************************************************
-			 *		BrowserNG
-			 */
-		
-			if (ua.match('BrowserNG')) {
-				this.browser.name = 'Nokia Browser';
-
-				if (match = /BrowserNG\/([0-9.]*)/.exec(ua)) {
-					this.browser.version = new Version({ value: match[1], details: 3, builds: false });
-				}
-			}
-
-			/****************************************************
-			 *		Nokia Browser
-			 */
-		
-			if (ua.match('NokiaBrowser')) {
-				this.browser.name = 'Nokia Browser';
-
-				if (match = /NokiaBrowser\/([0-9.]*)/.exec(ua)) {
-					this.browser.version = new Version({ value: match[1], details: 3 });
-				}
-			}
-			
-			if (ua.match('OviBrowser')) {
-				this.browser.name = 'Nokia Browser';
-
-				if (match = /OviBrowser\/([0-9.]*)/.exec(ua)) {
-					this.browser.version = new Version({ value: match[1], details: 3 });
-				}
-			}
-			
-			/****************************************************
-			 *		Nokia Xpress
-			 *
-			 *		Mozilla/5.0 (X11; Linux x86_64; rv:5.0.1) Gecko/20120822 OSRE/1.0.7f
-			 */
-			
-			if (ua.match('OSRE')) {
-				this.browser.name = 'Nokia Xpress';
-				this.browser.mode = 'proxy';
-
-				if (match = /OSRE\/([0-9.]*)/.exec(ua)) {
-					this.browser.version = new Version({ value: match[1], details: 3 });
-				}
-
-				this.device.type = TYPE_MOBILE;
-			}
-			
-			
-			/****************************************************
-			 *		MicroB
-			 */
-		
-			if (ua.match('Maemo[ |_]Browser')) {
-				this.browser.name = 'MicroB';
-
-				if (match = /Maemo[ |_]Browser[ |_]([0-9.]*)/.exec(ua)) {
-					this.browser.version = new Version({ value: match[1], details: 3 });
-				}
-			}
-			
-
-			/****************************************************
-			 *		NetFront
-			 */
-		
-			if (ua.match('Net[fF]ront')) {
-				this.browser.name = 'NetFront';
-				this.device.type = TYPE_MOBILE;
-
-				if (match = /NetFront\/([0-9.]*)/.exec(ua)) {
-					this.browser.version = new Version({ value: match[1] });
-				}
-
-				if (ua.match('InettvBrowser')) {
-					this.device.type = TYPE_TELEVISION;
-				}
-			}
-			
-			/****************************************************
-			 *		Silk
-			 */
-		
-			if (ua.match('Silk')) {
-				if (ua.match('Silk-Accelerated')) {
-					this.browser.name = 'Silk';
-
-					if (match = /Silk\/([0-9.]*)/.exec(ua)) {
-						this.browser.version = new Version({ value: match[1], details: 2 });
-					}
-					
-					if (match = /; ([^;]*[^;\s])\s+Build/.exec(ua)) {
-						this.device = DeviceModels.identify('android', match[1]);
-					}		
-
-					if (!this.device.identified) {
-						this.device.manufacturer = 'Amazon';
-						this.device.model = 'Kindle Fire';
-						this.device.type = TYPE_TABLET;
-						this.device.identified = true;
-					}
-					
-					if (this.os.name != 'Android') {
-						this.os.name = 'Android';
-						this.os.version = null;
-					}
-				}
-			}
-
-			/****************************************************
-			 *		Dolfin
-			 */
-		
-			if (ua.match('Dolfin')) {
-				this.browser.name = 'Dolfin';
-
-				if (match = /Dolfin\/([0-9.]*)/.exec(ua)) {
-					this.browser.version = new Version({ value: match[1] });
-				}
-			}
-
-
-			/****************************************************
-			 *		Iris
-			 */
-		
-			if (ua.match('Iris')) {
-				this.browser.name = 'Iris';
-
-				this.device.type = TYPE_MOBILE;
-				this.device.model = null;
-				this.device.manufacturer = null;
-
-				this.os.name = 'Windows Mobile';
-				this.os.version = null;
-
-				if (match = /Iris\/([0-9.]*)/.exec(ua)) {
-					this.browser.version = new Version({ value: match[1] });
-				}
-				
-				if (match = / WM([0-9]) /.exec(ua)) {
-					this.os.version = new Version({ value: match[1] + '.0' });
-				} else {
-					this.browser.mode = 'desktop';
-				}
-			}
-
-			/****************************************************
-			 *		Jasmine
-			 */
-		
-			if (ua.match('Jasmine')) {
-				this.browser.name = 'Jasmine';
-
-				if (match = /Jasmine\/([0-9.]*)/.exec(ua)) {
-					this.browser.version = new Version({ value: match[1] });
-				}
-			}
-
-			/****************************************************
-			 *		Boxee
-			 */
-		
-			if (ua.match('Boxee')) {
-				this.browser.name = 'Boxee';
-				this.device.type = TYPE_TELEVISION;
-
-				if (match = /Boxee\/([0-9.]*)/.exec(ua)) {
-					this.browser.version = new Version({ value: match[1] });
-				}
-			}
-
-			/****************************************************
-			 *		LG Browser
-			 */
-			if (match = /LG Browser\/([0-9.]*)/.exec(ua)) {
-				this.browser.name = 'LG Browser';
-				this.browser.version = new Version({ value: match[1], details: 2 });
-				this.device.type = TYPE_TELEVISION;
-			}
-			
-			/****************************************************
-			 *		Espial
-			 */
-		
-			if (ua.match('Espial')) {
-				this.browser.name = 'Espial';
-				
-				this.os.name = '';
-				this.os.version = null;
-
-				if (this.device.type != TYPE_TELEVISION) {
-					this.device.type = TYPE_TELEVISION;
-					this.device.model = null;
-					this.device.manufacturer = null;
-				}
-				
-				if (match = /Espial\/([0-9.]*)/.exec(ua)) {
-					this.browser.version = new Version({ value: match[1] });
-				}
-			}
-
-			/****************************************************
-			 *		ANT Galio
-			 */
-			if (match = /ANTGalio\/([0-9.]*)/.exec(ua)) {
-				this.browser.name = 'ANT Galio';
-				this.browser.version = new Version({ value: match[1], details: 3 });
-				this.device.type = TYPE_TELEVISION;
-			}
-			
-			/****************************************************
-			 *		NetFront NX
-			 */
-			if (match = /NX\/([0-9.]*)/.exec(ua)) {
-				this.browser.name = 'NetFront NX';
-				this.browser.version = new Version({ value: match[1], details: 2 });
-				if (match = /DTV/i.exec(ua)) {
-					this.device.type = TYPE_TELEVISION;
-				} else if (match = /mobile/i.exec(ua)) {
-					this.device.type = TYPE_MOBILE;
-				} else {
-					this.device.type = 'desktop';
-				} 
-
-				this.os.name = null;
-				this.os.version = null;
-			}
-			
-			/****************************************************
-			 *		Obigo
-			 */
-		
-			if (ua.match(/Obigo/i)) {
-				this.browser.name = 'Obigo';
-
-				if (match = /Obigo\/([0-9.]*)/i.exec(ua)) {
-					this.browser.version = new Version({ value: match[1] });
-				}
-
-				if (match = /Obigo\/([A-Z])([0-9.]*)/i.exec(ua)) {
-					this.browser.name = 'Obigo ' + match[1];
-					this.browser.version = new Version({ value: match[2] });
-				}
-
-				if (match = /Obigo-([A-Z])([0-9.]*)\//i.exec(ua)) {
-					this.browser.name = 'Obigo ' + match[1];
-					this.browser.version = new Version({ value: match[2] });
-				}
-			}
-
-			/****************************************************
-			 *		UC Web
-			 */
-		
-			if (ua.match('UCWEB')) {
-				this.browser.stock = false;
-				this.browser.name = 'UC Browser';
-				
-				if (match = /UCWEB([0-9]*[.][0-9]*)/.exec(ua)) {
-					this.browser.version = new Version({ value: match[1], details: 3 });
-				}
-
-				if (this.os.name == 'Linux') {
-					this.os.name = '';
-				}
-				
-				this.device.type = TYPE_MOBILE;
-
-				if (match = /^IUC \(U;\s?iOS ([0-9\.]+);/.exec(ua)) {
-					this.os.name = 'iOS';
-					this.os.version = new Version({ value: match[1] });
-				}
-				
-				if (match = /^JUC \(Linux; U; ([0-9\.]+)[^;]*; [^;]+; ([^;]*[^\s])\s*; [0-9]+\*[0-9]+\)/.exec(ua)) {
-					this.os.name = 'Android';
-					this.os.version = new Version({ value: match[1] });
-
-					this.device = DeviceModels.identify('android', match[2]);
-				}
-			}
-
-			if (ua.match(/\) UC /)) {
-				this.browser.stock = false;
-				this.browser.name = 'UC Browser';
-			}
-
-			if (match = /UCBrowser\/([0-9.]*)/.exec(ua)) {
-				this.browser.stock = false;
-				this.browser.name = 'UC Browser';
-				this.browser.version = new Version({ value: match[1], details: 2 });
-			}
-						
-			/****************************************************
-			 *		NineSky
-			 */
-		
-			if (match = /Ninesky(?:-android-mobile(?:-cn)?)?\/([0-9.]*)/.exec(ua)) {
-				this.browser.name = 'NineSky';
-				this.browser.version = new Version({ value: match[1] });
-
-				if (this.os.name != 'Android') {
-					this.os.name = 'Android';
-					this.os.version = null;
-					
-					this.device.manufacturer = null;
-					this.device.model = null;
-				}
-			}
-
-			/****************************************************
-			 *		Skyfire
-			 */
-		
-			if (match = /Skyfire\/([0-9.]*)/.exec(ua)) {
-				this.browser.name = 'Skyfire';
-				this.browser.version = new Version({ value: match[1] });
-
-				this.device.type = TYPE_MOBILE;
-
-				this.os.name = 'Android';
-				this.os.version = null;
-			}
-			
-			/****************************************************
-			 *		Dolphin HD
-			 */
-		
-			if (match = /DolphinHDCN\/([0-9.]*)/.exec(ua)) {
-				this.browser.name = 'Dolphin';
-				this.browser.version = new Version({ value: match[1] });
-
-				this.device.type = TYPE_MOBILE;
-
-				if (this.os.name != 'Android') {
-					this.os.name = 'Android';
-					this.os.version = null;
-				}
-			}	
-
-			if (match = /Dolphin\/(?:INT|CN)/.exec(ua)) {
-				this.browser.name = 'Dolphin';
-				this.device.type = TYPE_MOBILE;
-			}	
-
-			/****************************************************
-			 *		QQ Browser
-			 */
-		
-			if (match = /(M?QQBrowser)\/([0-9.]*)/.exec(ua)) {
-				this.browser.name = 'QQ Browser';
-				
-				var version = match[2];
-				if (version.match(/^[0-9][0-9]$/)) version = version[0] + '.' + version[1];
-				
-				this.browser.version = new Version({ value: version, details: 2 });
-				this.browser.channel = ''
-				
-				if (!this.os.name && match[1] == 'QQBrowser') {
-					this.os.name = 'Windows';
-				}
-			}	
-
-			/****************************************************
-			 *		iBrowser
-			 */
-		
-			if (match = /(iBrowser)\/([0-9.]*)/.exec(ua) && !ua.match('OviBrowser')) {
-				this.browser.name = 'iBrowser';
-				
-				var version = match[2];
-				if (version.match(/[0-9][0-9]/)) version = version[0] + '.' + version[1];
-				
-				this.browser.version = new Version({ value: version, details: 2 });
-				this.browser.channel = ''
-			}	
-
-			/****************************************************
-			 *		Puffin
-			 */
-		
-			if (match = /Puffin\/([0-9.]*)/.exec(ua)) {
-				this.browser.name = 'Puffin';
-				this.browser.version = new Version({ value: match[1], details: 2 });
-
-				this.device.type = TYPE_MOBILE;
-
-				if (this.os.name == 'Linux') {
-					this.os.name = null;
-					this.os.version = null;
-				}
-			}	
-
-			/****************************************************
-			 *		Midori
-			 */
-		
-			if (match = /Midori\/([0-9.]*)/.exec(ua)) {
-				this.browser.name = 'Midori';
-				this.browser.version = new Version({ value: match[1] });
-
-				if (this.os.name != 'Linux') {
-					this.os.name = 'Linux';
-					this.os.version = null;
-				}
-
-				this.device.manufacturer = null;
-				this.device.model = null;
-				this.device.type = 'desktop';
-			}	
-
-			if (match = /midori$/.exec(ua)) {
-				this.browser.name = 'Midori';
-			}
-			
-			
-			/****************************************************
-			 *		Others
-			 */
-
-			var browsers = [
-				{ name: 'AdobeAIR', 			regexp: /AdobeAIR\/([0-9.]*)/ },
-				{ name: 'Awesomium', 			regexp: /Awesomium\/([0-9.]*)/ },
-				{ name: 'Bsalsa Embedded',		regexp: /EmbeddedWB ([0-9.]*)/ },
-				{ name: 'Canvace',				regexp: /Canvace Standalone\/([0-9.]*)/ },
-				{ name: 'Ekioh', 				regexp: /Ekioh\/([0-9.]*)/ },
-				{ name: 'JavaFX', 				regexp: /JavaFX\/([0-9.]*)/ },
-				{ name: 'GFXe', 				regexp: /GFXe\/([0-9.]*)/ },
-				{ name: 'LuaKit',	 			regexp: /luakit/ },
-				{ name: 'Titanium', 			regexp: /Titanium\/([0-9.]*)/ },
-				{ name: 'OpenWebKitSharp',		regexp: /OpenWebKitSharp/ },
-				{ name: 'Prism',	 			regexp: /Prism\/([0-9.]*)/ },
-				{ name: 'Qt', 					regexp: /Qt\/([0-9.]*)/ },
-				{ name: 'QtEmbedded', 			regexp: /QtEmbedded/ },
-				{ name: 'QtEmbedded', 			regexp: /QtEmbedded.*Qt\/([0-9.]*)/ },
-				{ name: 'RhoSimulator', 		regexp: /RhoSimulator/ },
-				{ name: 'UWebKit', 				regexp: /UWebKit\/([0-9.]*)/ },
-				
-				{ name: 'PhantomJS',	 		regexp: /PhantomJS\/([0-9.]*)/ },
-				{ name: 'Google Web Preview',	regexp: /Google Web Preview/ },
-
-				{ name: 'Google Earth', 		regexp: /Google Earth\/([0-9.]*)/ },
-				{ name: 'EA Origin',			regexp: /Origin\/([0-9.]*)/ },
-				{ name: 'SecondLife', 			regexp: /SecondLife\/([0-9.]*)/ },
-				{ name: 'Valve Steam', 			regexp: /Valve Steam/ },
-
-				{ name: 'Songbird', 			regexp: /Songbird\/([0-9.]*)/ },
-				{ name: 'Thunderbird', 			regexp: /Thunderbird\/([0-9.]*)/ },
-
-				{ name: '360 Extreme Explorer', regexp: /QIHU 360EE/ },
-				{ name: '360 Safe Explorer', 	regexp: /QIHU 360SE/ },
-				{ name: '360 Phone Browser', 	regexp: /360 Android Phone Browser \(V([0-9.]*)\)/ },
-				{ name: '360 Phone Browser', 	regexp: /360 Aphone Browser \(Version ([0-9.]*)\)/ },
-				{ name: 'ABrowse', 				regexp: /Abrowse ([0-9.]*)/ },
-				{ name: 'Abrowser', 			regexp: /Abrowser\/([0-9.]*)/ },
-				{ name: 'arora', 				regexp: /[Aa]rora\/([0-9.]*)/ },
-				{ name: 'Avant Browser',		regexp: /Avant TriCore/ },
-				{ name: 'Baidu Browser', 		regexp: /M?BaiduBrowser\/([0-9.]*)/i },
-				{ name: 'Baidu Browser', 		regexp: /BdMobile\/([0-9.]*)/i },
-				{ name: 'Baidu Browser', 		regexp: /FlyFlow\/([0-9.]*)/, details: 2 },
-				{ name: 'Baidu Browser', 		regexp: /BIDUBrowser[ \/]([0-9.]*)/ },
-				{ name: 'Camino', 				regexp: /Camino\/([0-9.]*)/ },
-				{ name: 'Canure',				regexp: /Canure\/([0-9.]*)/, details: 3 },
-				{ name: 'CometBird', 			regexp: /CometBird\/([0-9.]*)/ },
-				{ name: 'Comodo Dragon', 		regexp: /Comodo_Dragon\/([0-9.]*)/, details: 2 },
-				{ name: 'Conkeror', 			regexp: /[Cc]onkeror\/([0-9.]*)/ },
-				{ name: 'CoolNovo', 			regexp: /(?:CoolNovo|CoolNovoChromePlus)\/([0-9.]*)/, details: 3 },
-				{ name: 'ChromePlus', 			regexp: /ChromePlus(?:\/([0-9.]*))?$/, details: 3 },
-				{ name: 'Daedalus',				regexp: /Daedalus ([0-9.]*)/, details: 2 },
-				{ name: 'Demobrowser', 			regexp: /demobrowser\/([0-9.]*)/ },
-				{ name: 'Doga Rhodonit',		regexp: /DogaRhodonit/ },
-				{ name: 'Dooble', 				regexp: /Dooble(?:\/([0-9.]*))?/ },
-				{ name: 'Dorothy', 				regexp: /Dorothy$/ },
-				{ name: 'DWB', 					regexp: /dwb(?:-hg)?(?:\/([0-9.]*))?/ },
-				{ name: 'GNOME Web', 			regexp: /Epiphany\/([0-9.]*)/ },
-				{ name: 'FireWeb', 				regexp: /FireWeb\/([0-9.]*)/ },
-				{ name: 'Flock', 				regexp: /Flock\/([0-9.]*)/, details: 3 },
-				{ name:	'Galeon',				regexp: /Galeon\/([0-9.]*)/, details: 3 },
-				{ name: 'Helium', 				regexp: /HeliumMobileBrowser\/([0-9.]*)/ },
-				{ name: 'Hive Explorer', 		regexp: /HiveE/ },
-				{ name: 'iCab', 				regexp: /iCab\/([0-9.]*)/ },
-				{ name: 'Iceape', 				regexp: /Iceape\/([0-9.]*)/ },
-				{ name: 'IceCat', 				regexp: /IceCat ([0-9.]*)/ },
-				{ name: 'Iceweasel', 			regexp: /Iceweasel\/([0-9.]*)/ },
-				{ name: 'InternetSurfboard', 	regexp: /InternetSurfboard\/([0-9.]*)/ },
-				{ name: 'Iron', 				regexp: /Iron\/([0-9.]*)/, details: 2 },
-				{ name: 'Isis',					regexp: /BrowserServer/ },
-				{ name: 'Jumanji',				regexp: /jumanji/ },
-				{ name: 'Kazehakase',			regexp: /Kazehakase\/([0-9.]*)/ },
-				{ name: 'KChrome',				regexp: /KChrome\/([0-9.]*)/, details: 3 },
-				{ name: 'K-Meleon',				regexp: /K-Meleon\/([0-9.]*)/ },
-				{ name: 'Leechcraft',			regexp: /Leechcraft(?:\/([0-9.]*))?/, details: 2 },
-				{ name: 'Lightning',			regexp: /Lightning\/([0-9.]*)/ },
-				{ name: 'Lunascape', 			regexp: /Lunascape[\/| ]([0-9.]*)/, details: 3 },
-				{ name: 'iLunascape', 			regexp: /iLunascape\/([0-9.]*)/, details: 3 },
-				{ name: 'Intermec Browser', 	regexp: /Intermec\/([0-9.]*)/, details: 2 },
-				{ name: 'MaCross Mobile',		regexp: /MaCross\/([0-9.]*)/ },
-				{ name: 'Maxthon', 				regexp: /Maxthon[\/ ]([0-9.]*)/, details: 3 },
-				{ name: 'Mercury Browser',		regexp: /Mercury\/([0-9.]*)/ },
-				{ name: 'MiniBrowser',			regexp: /MiniBr?owserM\/([0-9.]*)/ },
-				{ name: 'MiniBrowser',			regexp: /MiniBrowserMobile\/([0-9.]*)/ },
-				{ name: 'MixShark', 			regexp: /MixShark\/([0-9.]*)/ },
-				{ name: 'Motorola WebKit',		regexp: /MotorolaWebKit(?:\/([0-9.]*))?/, details: 3 },
-				{ name: 'NetFront LifeBrowser',	regexp: /NetFrontLifeBrowser\/([0-9.]*)/ },
-				{ name: 'Netscape Navigator', 	regexp: /Navigator\/([0-9.]*)/, details: 3 },
-				{ name:	'Odyssey',				regexp: /OWB\/([0-9.]*)/ },
-				{ name: 'OmniWeb', 				regexp: /OmniWeb/ },
-				{ name:	'OneBrowser',			regexp: /OneBrowser\/([0-9.]*)/ },
-				{ name:	'Orca',					regexp: /Orca\/([0-9.]*)/ },
-				{ name:	'Open Sankoré',			regexp: /Open-Sankore\/([0-9.]*)/ },
-				{ name: 'Origyn',				regexp: /Origyn Web Browser/ },
-				{ name: 'Palemoon', 			regexp: /Pale[mM]oon\/([0-9.]*)/ },
-				{ name: 'Phantom', 				regexp: /Phantom\/V([0-9.]*)/ },
-				{ name: 'Polaris',	 			regexp: /Polaris\/v?([0-9.]*)/i, details: 2 },
-				{ name: 'Qihoo 360',			regexp: /QIHU THEWORLD/ },
-				{ name: 'QtCreator',			regexp: /QtCreator\/([0-9.]*)/ },
-				{ name: 'QtQmlViewer',			regexp: /QtQmlViewer/ },
-				{ name: 'QtTestBrowser',		regexp: /QtTestBrowser\/([0-9.]*)/ },
-				{ name: 'QtWeb',				regexp: /QtWeb Internet Browser\/([0-9.]*)/ },
-				{ name: 'QupZilla', 			regexp: /QupZilla\/([0-9.]*)/ },
-				{ name: 'Roccat',	 			regexp: /Roccat\/([0-9]\.[0-9.]*)/ },
-				{ name: 'Raven for Mac', 		regexp: /Raven for Mac\/([0-9.]*)/ },
-				{ name: 'rekonq', 				regexp: /rekonq/ },
-				{ name: 'RockMelt', 			regexp: /RockMelt\/([0-9.]*)/, details: 2 },
-				{ name: 'Sleipnir', 			regexp: /Sleipnir\/([0-9.]*)/, details: 3 },
-				{ name: 'SMBrowser', 			regexp: /SMBrowser/ },
-				{ name: 'Sogou Explorer', 		regexp: /SE 2.X MetaSr/ },
-				{ name: 'Snowshoe',				regexp: /Snowshoe\/([0-9.]*)/, details: 2 },
-				{ name: 'Sputnik', 				regexp: /Sputnik\/([0-9.]*)/i, details: 3 },
-				{ name: 'Stainless',			regexp: /Stainless\/([0-9.]*)/ },
-				{ name: 'SunChrome', 			regexp: /SunChrome\/([0-9.]*)/ },
-				{ name: 'Surf', 				regexp: /Surf\/([0-9.]*)/ },
-				{ name: 'TaoBrowser',			regexp: /TaoBrowser\/([0-9.]*)/, details: 2 },
-				{ name: 'TaomeeBrowser', 		regexp: /TaomeeBrowser\/([0-9.]*)/, details: 2 },
-				{ name:	'TazWeb',				regexp: /TazWeb/ },
-				{ name: 'Uzbl', 				regexp: /^Uzbl/ },
-				{ name: 'Viera', 				regexp: /Viera\/([0-9.]*)/ },
-				{ name: 'Villanova', 			regexp: /Villanova\/([0-9.]*)/, details: 3 },
-				{ name: 'Wavelink Velocity', 	regexp: /Wavelink Velocity Browser\/([0-9.]*)/, details: 2 },
-				{ name: 'WebPositive', 			regexp: /WebPositive/ },
-				{ name: 'WebRender', 			regexp: /WebRender/ },
-				{ name: 'Wyzo', 				regexp: /Wyzo\/([0-9.]*)/, details: 3 },
-				{ name: 'Yandex Browser',		regexp: /YaBrowser\/([0-9.]*)/, details: 2 },
-				{ name: 'Zetakey',				regexp: /Zetakey Webkit\/([0-9.]*)/ },
-				{ name: 'Zetakey',				regexp: /Zetakey\/([0-9.]*)/ }
-			]
-
-			for (var b = 0; b < browsers.length; b++) {
-				if (match = browsers[b].regexp.exec(ua)) {
-					this.browser.name = browsers[b].name;
-					this.browser.channel = '';
-					this.browser.stock = false;
-					
-					if (match[1]) {
-						this.browser.version = new Version({ value: match[1], details: browsers[b].details || null }); 
-					} else {
-						this.browser.version = null;
-					}
-				}
-			}
-
-
-
-
-			/****************************************************
-			 *		WebKit
-			 */
-	
-			if (match = /WebKit\/([0-9.]*)/i.exec(ua)) {
-				this.engine.name = 'Webkit';
-				this.engine.version = new Version({ value: match[1] });
-			}
-
-			if (match = /Browser\/AppleWebKit([0-9.]*)/i.exec(ua)) {
-				this.engine.name = 'Webkit';
-				this.engine.version = new Version({ value: match[1] });
-			}		
-
-			/****************************************************
-			 *		KHTML
-			 */
-		
-			if (match = /KHTML\/([0-9.]*)/.exec(ua)) {
-				this.engine.name = 'KHTML';
-				this.engine.version = new Version({ value: match[1] });
-			}
-
-			/****************************************************
-			 *		Gecko
-			 */
-		
-			if (/Gecko/.exec(ua) && ! /like Gecko/i.exec(ua)) {
-				this.engine.name = 'Gecko';
-				
-				if (match = /; rv:([^\)]+)\)/.exec(ua)) {
-					this.engine.version = new Version({ value: match[1] });
-				}
-			}
-
-			/****************************************************
-			 *		Presto
-			 */
-		
-			if (match = /Presto\/([0-9.]*)/.exec(ua)) {
-				this.engine.name = 'Presto';
-				this.engine.version = new Version({ value: match[1] });
-			}
-
-			/****************************************************
-			 *		Trident
-			 */
-		
-			if (match = /Trident\/([0-9.]*)/.exec(ua)) {
-				this.engine.name = 'Trident';
-				this.engine.version = new Version({ value: match[1] });
-				
-				if (this.browser.name == 'Internet Explorer') {
-					if (parseVersion(this.engine.version) == 6 && parseFloat(this.browser.version) < 10) {
-						this.browser.version = new Version({ value: '10.0' });
-						this.browser.mode = 'compat';
-					}
-
-					if (parseVersion(this.engine.version) == 5 && parseFloat(this.browser.version) < 9) {
-						this.browser.version = new Version({ value: '9.0' });
-						this.browser.mode = 'compat';
-					}
-
-					if (parseVersion(this.engine.version) == 4 && parseFloat(this.browser.version) < 8) {
-						this.browser.version = new Version({ value: '8.0' });
-						this.browser.mode = 'compat';
-					}
-				}
-
-				if (this.os.name == 'Windows Phone') {
-					if (parseVersion(this.engine.version) == 6 && parseFloat(this.os.version) < 8) {
-						this.os.version = new Version({ value: '8.0' });
-					}
-
-					if (parseVersion(this.engine.version) == 5 && parseFloat(this.os.version) < 7.5) {
-						this.os.version = new Version({ value: '7.5' });
-					}
-				}
-			}
-			
-
-			/****************************************************
-			 *		Corrections
-			 */
-		
-			if (this.os.name == 'Android' && this.browser.stock) {
-				this.browser.hidden = true;
-			}
-
-			if (this.os.name == 'Aliyun OS' && this.browser.stock) {
-				this.browser.hidden = true;
-			}
-			
-			if (this.os.name == 'iOS' && this.browser.name == 'Opera Mini') {
-				this.os.version = null;
-			}	
-			
-			if (this.browser.name == 'Midori' && this.engine.name != 'Webkit') {
-				this.engine.name = 'Webkit';
-				this.engine.version = null;
-			}
-			
-			if (this.device.type == TYPE_TELEVISION && this.browser.name == 'Opera') {
-				this.browser.name = 'Opera Devices';
-				switch (true) {
-					case this.engine.version.is('2.12'):	this.browser.version = new Version({ value: 3.4 }); break;
-					case this.engine.version.is('2.11'):	this.browser.version = new Version({ value: 3.3 }); break;
-					case this.engine.version.is('2.10'):	this.browser.version = new Version({ value: 3.2 }); break;
-					case this.engine.version.is('2.9'):		this.browser.version = new Version({ value: 3.1 }); break;
-					case this.engine.version.is('2.8'):		this.browser.version = new Version({ value: 3.0 }); break;
-					case this.engine.version.is('2.7'):		this.browser.version = new Version({ value: 2.9 }); break;
-					case this.engine.version.is('2.6'):		this.browser.version = new Version({ value: 2.8 }); break;
-					case this.engine.version.is('2.4'):		this.browser.version = new Version({ value: 10.3 }); break;
-					case this.engine.version.is('2.3'):		this.browser.version = new Version({ value: 10 }); break;
-					case this.engine.version.is('2.2'):		this.browser.version = new Version({ value: 9.7 }); break;
-					case this.engine.version.is('2.1'):		this.browser.version = new Version({ value: 9.6 }); break;
-					default:	this.browser.version = null;
-				}
-				
-				this.os.name = null;
-				this.os.version = null;
-			}
-			
-			
-			/****************************************************
-			 *		Camouflage
-			 */
-			 
-			if (this.options.detectCamouflage) {
-
-				if (match = /Mac OS X 10_6_3; ([^;]+); [a-z]{2}-(?:[a-z]{2})?\)/.exec(ua)) {
-					this.browser.name = '';
-					this.browser.version = null;
-					this.browser.mode = 'desktop';
-					
-					this.os.name = 'Android';
-					this.os.version = null;
-				
-					this.engine.name = 'Webkit';
-					this.engine.version = null;
-	
-					this.device = DeviceModels.identify('android', match[1]);
-
-					this.features.push('foundDevice');
-				}
-
-				if (match = /Linux Ventana; [a-z]{2}-[a-z]{2}; (.+) Build/.exec(ua)) {
-					this.browser.name = '';
-					this.browser.version = null;
-					this.browser.mode = 'desktop';
-					
-					this.os.name = 'Android';
-					this.os.version = null;
-				
-					this.engine.name = 'Webkit';
-					this.engine.version = null;
-	
-					this.device = DeviceModels.identify('android', match[1]);
-
-					this.features.push('foundDevice');
-				}
-
-				if (this.browser.name == 'Safari') {
-					if (this.os.name != 'iOS' && /AppleWebKit\/([0-9]+.[0-9]+)/i.exec(ua)[1] != /Safari\/([0-9]+.[0-9]+)/i.exec(ua)[1]) {
-						this.features.push('safariMismatch');
-						this.camouflage = true;			
-					}
-	
-					if (this.os.name == 'iOS' && ! ua.match(/^Mozilla/)) {
-						this.features.push('noMozillaPrefix');
-						this.camouflage = true;			
-					}
-
-					if (! /Version\/[0-9\.]+/.exec(ua)) {
-						this.features.push('noVersion');
-						this.camouflage = true;			
-					}
-				}
-				
-				if (this.browser.name == 'Chrome'){
-					if (! /(?:Chrome|CrMo|CriOS)\/([0-9]{1,2}\.[0-9]\.[0-9]{3,4}\.[0-9]+)/.exec(ua)) {
-						this.features.push('wrongVersion');
-						this.camouflage = true;			
-					}
-				}
-
-
-				if (this.options.useFeatures) {
-					/* If it claims not to be Trident, but it is probably Trident running camouflage mode */
-					if (window.ActiveXObject) {
-						this.features.push('trident');		
-		
-						if (typeof this.engine.name != 'undefined' && this.engine.name != 'Trident') {
-							this.camouflage = typeof this.browser.name == 'undefined' || this.browser.name != 'Maxthon';			
-						}	
-					}
-				
-					/* If it claims not to be Opera, but it is probably Opera running camouflage mode */
-					if (window.opera) {
-						this.features.push('presto');		
-		
-						if (typeof this.engine.name != 'undefined' && this.engine.name != 'Presto') {
-							this.camouflage = true;			
-						}	
-
-						if (this.browser.name == 'Internet Explorer') {
-							this.camouflage = true;			
-						}
-					}
-					
-					/* If it claims not to be Gecko, but it is probably Gecko running camouflage mode */
-					if ('getBoxObjectFor' in document || 'mozInnerScreenX' in window) {
-						this.features.push('gecko');		
-		
-						if (typeof this.engine.name != 'undefined' && this.engine.name != 'Gecko') {
-							this.camouflage = true;			
-						}	
-						
-						if (this.browser.name == 'Internet Explorer') {
-							this.camouflage = true;			
-						}
-					}
-					
-					/* If it claims not to be Webkit, but it is probably Webkit running camouflage mode */
-					if ('WebKitCSSMatrix' in window || 'WebKitPoint' in window || 'webkitStorageInfo' in window || 'webkitURL' in window) {
-						this.features.push('webkit');		
-		
-						if (typeof this.engine.name != 'undefined' && this.engine.name != 'Webkit') {
-							this.camouflage = true;			
-						}	
-
-						if (this.browser.name == 'Internet Explorer') {
-							this.camouflage = true;			
-						}
-					}
-					
-					
-					
-					/* If it claims to be Safari and uses V8, it is probably an Android device running camouflage mode */
-					if (this.engine.name == 'Webkit' && ({}.toString).toString().indexOf("\n") === -1) {
-						this.features.push('v8');		
-
-						if (this.browser != null && this.browser.name == 'Safari') {
-							this.camouflage = true;	
-						}	
-					}
-	
-	
-	
-					/* If we have an iPad that is not 768 x 1024, we have an imposter */
-					if (this.device.model == 'iPad') {
-						if ((screen.width != 0 && screen.height != 0) && (screen.width != 768 && screen.height != 1024) && (screen.width != 1024 && screen.height != 768)) {
-							this.features.push('sizeMismatch');
-							this.camouflage = true;			
-						}				
-					}
-					
-					/* If we have an iPhone or iPod that is not 320 x 480, we have an imposter */
-					if (this.device.model == 'iPhone' || this.device.model == 'iPod') {
-						if ((screen.width != 0 && screen.height != 0) && (screen.width != 320 && screen.height != 480) && (screen.width != 480 && screen.height != 320)) {
-							this.features.push('sizeMismatch');
-							this.camouflage = true;			
-						}				
-					}
-					
-					
-					if (this.os.name == 'iOS' && this.os.version) {
-					
-						if (this.os.version.isOlder('4.0') && 'sandbox' in document.createElement('iframe')) {
-							this.features.push('foundSandbox');
-							this.camouflage = true;			
-						}
-						
-						if (this.os.version.isOlder('4.2') && 'WebSocket' in window) {
-							this.features.push('foundSockets');
-							this.camouflage = true;			
-						}
-	
-						if (this.os.version.isOlder('5.0') && !!window.Worker) {
-							this.features.push('foundWorker');
-							this.camouflage = true;			
-						}
-
-						if (this.os.version.isNewer('2.1') && !window.applicationCache) {
-							this.features.push('noAppCache');
-							this.camouflage = true;			
-						}
-					}
-					
-					if (this.os.name != 'iOS' && this.browser.name == 'Safari' && this.browser.version) {
-					
-						if (this.browser.version.isOlder('4.0') && !!window.applicationCache) {
-							this.features.push('foundAppCache');
-							this.camouflage = true;			
-						}
-					
-						if (this.browser.version.isOlder('4.1') && !!(window.history && history.pushState)) {
-							this.features.push('foundHistory');
-							this.camouflage = true;			
-						}
-					
-						if (this.browser.version.isOlder('5.1') && !!document.documentElement.webkitRequestFullScreen) {
-							this.features.push('foundFullscreen');
-							this.camouflage = true;			
-						}
-					
-						if (this.browser.version.isOlder('5.2') && 'FileReader' in window) {
-							this.features.push('foundFileReader');
-							this.camouflage = true;			
-						}
-					}
-				}
-			}
-		},
-		
-		toString: function() {
-			var prefix = this.camouflage ? 'an unknown browser that imitates ' : '';
-			var browser = os = device = engine = '';
-			
-			browser += (this.browser.name ? this.browser.name + (this.browser.channel ? ' ' + this.browser.channel : '') + (this.browser.version ? ' ' + this.browser.version.toString() : '') : '');
-			os += (this.os.name ? this.os.name + (this.os.version ? ' ' + this.os.version.toString() : '') : '');
-			engine += (typeof this.engine.name != 'undefined' && this.engine.name ? this.engine.name : '') ;
-			
-			if (this.device.identified)			
-				device += (typeof this.device.manufacturer != 'undefined' && this.device.manufacturer ? this.device.manufacturer + ' ' : '') + (typeof this.device.model != 'undefined' && this.device.model ? this.device.model : '');
-			else
-				device += (typeof this.device.model != 'undefined' && this.device.model ? 'unrecognized device (' + this.device.model + ')' : '');
-			
-			if (!device && !os && this.device.type == TYPE_TELEVISION) {
-				device = TYPE_TELEVISION;
-			}
-		
-			if (!device && this.device.type == 'emulator') {
-				device = 'emulator';
-			}
-		
-			if (browser && os && device) {
-				return prefix + browser + ' on a ' + device + ' running ' + os;
-			}
-		
-			else if (browser && !os && device) {
-				return prefix + browser + ' on a ' + device;
-			}
-		
-			else if (browser && os && !device) {
-				return prefix + browser + ' on ' + os;
-			}
-		
-			else if (!browser && os && device) {
-				return prefix + 'a ' + device + ' running ' + os;
-			}
-		
-			else if (browser && !os && !device) {
-				return prefix + browser;
-			}
-		
-			else if (!browser && !os && device) {
-				return prefix + 'a ' + device;
-			}
-		
-			else if (this.device.type == 'desktop' && os && engine != '' && !device) {
-				return 'an unknown browser based on ' + engine + ' running on ' + os;
-			}
-		
-			else if (this.browser.stock && os && !device) {
-				return os;
-			}
-		
-			else if (this.browser.stock && engine != '' && !device) {
-				return 'an unknown browser based on ' + engine;
-			}
-		
-			else {
-				return 'an unknown browser';
-			}
-		}
-	};
-
-	function parseVersion(version) {
-		version = version.toString();
-		var components = version.split('.');
-		var major = components.shift();
-		return parseFloat(major + '.' + components.join(''));
-	}
-
-
-	return Detected;
-})();	
-
diff --git a/scripts/useragents/.htaccess b/scripts/useragents/.htaccess
new file mode 100644
index 00000000..c1fb1d4e
--- /dev/null
+++ b/scripts/useragents/.htaccess
@@ -0,0 +1 @@
+AddType application/x-httpd-php .js
diff --git a/scripts/useragents/detect.js b/scripts/useragents/detect.js
new file mode 100644
index 00000000..354cab21
--- /dev/null
+++ b/scripts/useragents/detect.js
@@ -0,0 +1,420 @@
+<?php
+
+	header('Content-Type: text/javascript');
+
+	include('useragents.lib.php');
+		
+	$detected = new Detected(apache_request_headers());
+
+?>
+	
+var UserAgents = (function(){
+	
+ 	var Version = function() { this.initialize.apply(this, Array.prototype.slice.call(arguments)) };
+	Version.prototype = {
+		initialize: function(v) {
+			this.original = v.value || null;
+			this.alias = v.alias || null;
+			this.details = v.details || null;
+			this.builds = typeof v.builds != 'undefined' ? v.builds : true;
+
+			this.major = 0;
+			this.minor = 0;
+			this.revision = '';
+			this.build = '';
+			this.type = '';
+						
+			var match;
+			if (match = /([0-9]+)(?:\.([0-9]+))?(?:\.([0-9]+))?(?:\.([0-9]+))?(?:([ab])([0-9]+))?/.exec(this.original)) {
+				if (typeof match[1] != 'undefined') {
+					this.major = match[1];
+				}
+
+				if (typeof match[2] != 'undefined') {
+					this.minor = match[2];
+				}
+
+				if (typeof match[3] != 'undefined') {
+					this.revision = match[3];
+				}
+
+				if (typeof match[4] != 'undefined') {
+					this.build = match[4];
+				}
+
+				if (typeof match[5] != 'undefined') {
+					switch(match[5]) {
+						case 'a':	this.type = 'alpha'; break;
+						case 'b':	this.type = 'beta'; break;
+					}
+
+					if (typeof match[6] != 'undefined') {
+						this.build = match[6];
+					}
+				}
+			}
+		},
+		
+		is: function(v) {
+			var compare = new Version({ value: v });
+			return this.valueOf() == compare.valueOf();
+		},
+		
+		isOlder: function(v) {
+			var compare = new Version({ value: v });
+			return this.valueOf() < compare.valueOf();
+		},
+		
+		isNewer: function(v) {
+			var compare = new Version({ value: v });
+			return this.valueOf() > compare.valueOf();
+		},
+		
+		valueOf: function() {
+			return parseFloat('' + this.major + '.' + ('0000' + this.minor).slice(-4));
+		},
+		
+		toString: function() {
+			if (this.alias)
+				return this.alias;
+
+			var version = '';
+
+			if (this.major || this.minor) {
+				var v = [];
+				v.push(this.major);
+				if (this.minor != '' && this.minor != null) v.push(this.minor);
+				if (this.revision != '' && this.revision != null) v.push(this.revision);
+				if (this.type == '' && this.build) v.push(this.build);
+				if (this.details < 0) v.splice(this.details, 0 - this.details);
+				if (this.details > 0) v.splice(this.details, v.length - this.details);
+				
+				if (!this.builds) {
+					for (var i = 0; i < v.length; i++) {
+						if (v[i] > 999) {
+							v.splice(i, 1);
+							i--;
+						}					
+					}
+				}
+				
+				version = v.join('.');
+			
+				if (this.type != '') version += this.type[0] + (this.build ? this.build : '');
+			}
+
+			return version;
+		}
+	}
+
+ 	var Detected = function() { this.initialize.apply(this, arguments) };
+	Detected.prototype = {
+		initialize: function(options) {
+			this.options = {
+				useFeatures:		options && options.useFeatures || false,
+				detectCamouflage:	options && options.detectCamouflage || false
+			}
+
+<?php $detected->toJavaScript(); ?>
+
+			this.camouflage = false;
+			this.features = [];
+			
+			this.detect(navigator.userAgent);
+		},
+		
+		isX: function() {
+			var valid = true;
+			var x = arguments[0];
+			
+			if (arguments.length >= 2) {
+				valid = valid && this[x].name == arguments[1];
+			}
+			
+			if (arguments.length >= 4 && typeof this[x].version != 'undefined' && valid) {
+				var v1 = 0 + this[x].version;
+				var v2 = 0 + new Version({ value: arguments[3] });
+				switch (arguments[2]) {
+					case '<':	valid = valid && v1 < v2; break;
+					case '<=':	valid = valid && v1 <= v2; break;
+					case '=':	valid = valid && v1 == v2; break;
+					case '>':	valid = valid && v1 > v2; break;
+					case '>=':	valid = valid && v1 >= v2; break;
+				}
+			}
+			
+			return valid;
+		},
+		
+		isBrowser: function() { var a = Array.prototype.slice.call(arguments); a.unshift('browser'); return this.isX.apply(this, a); },
+		isEngine: function() { var a = Array.prototype.slice.call(arguments); a.unshift('engine'); return this.isX.apply(this, a); },
+		isOs: function() { var a = Array.prototype.slice.call(arguments); a.unshift('os'); return this.isX.apply(this, a); },
+				
+		isType: function() {
+			var valid = false;
+			for (var a = 0; a < arguments.length; a++) valid = valid || arguments[a] == this.device.type;
+			return valid;
+		},
+
+		detect: function(ua) {
+			if (ua == 'Mozilla/5.0 (X11; U; Linux i686; zh-CN; rv:1.2.3.4) Gecko/') {
+				if (this.browser.name != 'UC Browser') {
+					this.browser.name = 'UC Browser';
+					this.engine.name = 'Gecko';
+				}
+				
+				this.engine.name = 'Gecko';
+				this.engine.version = null;
+				
+				this.device.type = 'mobile';
+			}
+		
+			if (this.options.detectCamouflage) {
+
+				if (match = /Mac OS X 10_6_3; ([^;]+); [a-z]{2}-(?:[a-z]{2})?\)/.exec(ua)) {
+					this.browser.name = '';
+					this.browser.version = null;
+					this.browser.mode = 'desktop';
+					
+					this.os.name = 'Android';
+					this.os.version = null;
+				
+					this.engine.name = 'Webkit';
+					this.engine.version = null;
+	
+					this.features.push('foundDevice');
+				}
+
+				if (match = /Linux Ventana; [a-z]{2}-[a-z]{2}; (.+) Build/.exec(ua)) {
+					this.browser.name = '';
+					this.browser.version = null;
+					this.browser.mode = 'desktop';
+					
+					this.os.name = 'Android';
+					this.os.version = null;
+				
+					this.engine.name = 'Webkit';
+					this.engine.version = null;
+	
+					this.features.push('foundDevice');
+				}
+
+				if (this.browser.name == 'Safari') {
+					if (this.os.name != 'iOS' && /AppleWebKit\/([0-9]+.[0-9]+)/i.exec(ua)[1] != /Safari\/([0-9]+.[0-9]+)/i.exec(ua)[1]) {
+						this.features.push('safariMismatch');
+						this.camouflage = true;			
+					}
+	
+					if (this.os.name == 'iOS' && ! ua.match(/^Mozilla/)) {
+						this.features.push('noMozillaPrefix');
+						this.camouflage = true;			
+					}
+
+					if (! /Version\/[0-9\.]+/.exec(ua)) {
+						this.features.push('noVersion');
+						this.camouflage = true;			
+					}
+				}
+				
+				if (this.browser.name == 'Chrome'){
+					if (! /(?:Chrome|CrMo|CriOS)\/([0-9]{1,2}\.[0-9]\.[0-9]{3,4}\.[0-9]+)/.exec(ua)) {
+						this.features.push('wrongVersion');
+						this.camouflage = true;			
+					}
+				}
+
+
+				if (this.options.useFeatures) {
+					/* If it claims not to be Trident, but it is probably Trident running camouflage mode */
+					if (window.ActiveXObject) {
+						this.features.push('trident');		
+		
+						if (typeof this.engine.name != 'undefined' && this.engine.name != 'Trident') {
+							this.camouflage = typeof this.browser.name == 'undefined' || (this.browser.name != 'Maxthon' && this.browser.name != 'Motorola WebKit');			
+						}	
+					}
+				
+					/* If it claims not to be Opera, but it is probably Opera running camouflage mode */
+					if (window.opera) {
+						this.features.push('presto');		
+		
+						if (typeof this.engine.name != 'undefined' && this.engine.name != 'Presto') {
+							this.camouflage = true;			
+						}	
+
+						if (this.browser.name == 'Internet Explorer') {
+							this.camouflage = true;			
+						}
+					}
+					
+					/* If it claims not to be Gecko, but it is probably Gecko running camouflage mode */
+					if ('getBoxObjectFor' in document || 'mozInnerScreenX' in window) {
+						this.features.push('gecko');		
+		
+						if (typeof this.engine.name != 'undefined' && this.engine.name != 'Gecko') {
+							this.camouflage = true;			
+						}	
+						
+						if (this.browser.name == 'Internet Explorer') {
+							this.camouflage = true;			
+						}
+					}
+					
+					/* If it claims not to be Webkit, but it is probably Webkit running camouflage mode */
+					if ('WebKitCSSMatrix' in window || 'WebKitPoint' in window || 'webkitStorageInfo' in window || 'webkitURL' in window) {
+						this.features.push('webkit');		
+		
+						if (typeof this.engine.name != 'undefined' && this.engine.name != 'Webkit') {
+							this.camouflage = true;			
+						}	
+
+						if (this.browser.name == 'Internet Explorer') {
+							this.camouflage = true;			
+						}
+					}
+					
+					
+					
+					/* If it claims to be Safari and uses V8, it is probably an Android device running camouflage mode */
+					if (this.engine.name == 'Webkit' && ({}.toString).toString().indexOf("\n") === -1) {
+						this.features.push('v8');		
+
+						if (this.browser != null && this.browser.name == 'Safari') {
+							this.camouflage = true;	
+						}	
+					}
+	
+	
+	
+					/* If we have an iPad that is not 768 x 1024, we have an imposter */
+					if (this.device.model == 'iPad') {
+						if ((screen.width != 0 && screen.height != 0) && (screen.width != 768 && screen.height != 1024) && (screen.width != 1024 && screen.height != 768)) {
+							this.features.push('sizeMismatch');
+							this.camouflage = true;			
+						}				
+					}
+					
+					/* If we have an iPhone or iPod that is not 320 x 480, we have an imposter */
+					if (this.device.model == 'iPhone' || this.device.model == 'iPod') {
+						if ((screen.width != 0 && screen.height != 0) && (screen.width != 320 && screen.height != 480) && (screen.width != 480 && screen.height != 320)) {
+							this.features.push('sizeMismatch');
+							this.camouflage = true;			
+						}				
+					}
+					
+					
+					if (this.os.name == 'iOS' && this.browser.name != 'Opera Mini' && this.browser.name != 'UC Browser' && this.os.version) {
+					
+						if (this.os.version.isOlder('4.0') && 'sandbox' in document.createElement('iframe')) {
+							this.features.push('foundSandbox');
+							this.camouflage = true;			
+						}
+						
+						if (this.os.version.isOlder('4.2') && 'WebSocket' in window) {
+							this.features.push('foundSockets');
+							this.camouflage = true;			
+						}
+	
+						if (this.os.version.isOlder('5.0') && !!window.Worker) {
+							this.features.push('foundWorker');
+							this.camouflage = true;			
+						}
+
+						if (this.os.version.isNewer('2.1') && !window.applicationCache) {
+							this.features.push('noAppCache');
+							this.camouflage = true;			
+						}
+					}
+					
+					if (this.os.name != 'iOS' && this.browser.name == 'Safari' && this.browser.version) {
+					
+						if (this.browser.version.isOlder('4.0') && !!window.applicationCache) {
+							this.features.push('foundAppCache');
+							this.camouflage = true;			
+						}
+					
+						if (this.browser.version.isOlder('4.1') && !!(window.history && history.pushState)) {
+							this.features.push('foundHistory');
+							this.camouflage = true;			
+						}
+					
+						if (this.browser.version.isOlder('5.1') && !!document.documentElement.webkitRequestFullScreen) {
+							this.features.push('foundFullscreen');
+							this.camouflage = true;			
+						}
+					
+						if (this.browser.version.isOlder('5.2') && 'FileReader' in window) {
+							this.features.push('foundFileReader');
+							this.camouflage = true;			
+						}
+					}
+				}
+			}
+		},
+		
+		toString: function() {
+			var prefix = this.camouflage ? 'an unknown browser that imitates ' : '';
+			var browser = os = device = engine = '';
+			
+			browser += (this.browser.name ? this.browser.name + (this.browser.channel ? ' ' + this.browser.channel : '') + (this.browser.version ? ' ' + this.browser.version.toString() : '') : '');
+			os += (this.os.name ? this.os.name + (this.os.version ? ' ' + this.os.version.toString() : '') : '');
+			engine += (typeof this.engine.name != 'undefined' && this.engine.name ? this.engine.name : '') ;
+			
+			if (this.device.identified)			
+				device += (typeof this.device.manufacturer != 'undefined' && this.device.manufacturer ? this.device.manufacturer + ' ' : '') + (typeof this.device.model != 'undefined' && this.device.model ? this.device.model : '');
+			else
+				device += (typeof this.device.model != 'undefined' && this.device.model ? 'unrecognized device (' + this.device.model + ')' : '');
+			
+			if (!device && !os && this.device.type == 'television') {
+				device = 'television';
+			}
+		
+			if (!device && this.device.type == 'emulator') {
+				device = 'emulator';
+			}
+		
+			if (browser && os && device) {
+				return prefix + browser + ' on a ' + device + ' running ' + os;
+			}
+		
+			else if (browser && !os && device) {
+				return prefix + browser + ' on a ' + device;
+			}
+		
+			else if (browser && os && !device) {
+				return prefix + browser + ' on ' + os;
+			}
+		
+			else if (!browser && os && device) {
+				return prefix + 'a ' + device + ' running ' + os;
+			}
+		
+			else if (browser && !os && !device) {
+				return prefix + browser;
+			}
+		
+			else if (!browser && !os && device) {
+				return prefix + 'a ' + device;
+			}
+		
+			else if (this.device.type == 'desktop' && os && engine != '' && !device) {
+				return 'an unknown browser based on ' + engine + ' running on ' + os;
+			}
+		
+			else if (this.browser.stock && os && !device) {
+				return os;
+			}
+		
+			else if (this.browser.stock && engine != '' && !device) {
+				return 'an unknown browser based on ' + engine;
+			}
+		
+			else {
+				return 'an unknown browser';
+			}
+		}
+	};
+
+
+	return Detected;
+})();	
diff --git a/scripts/useragents/index.php b/scripts/useragents/index.php
new file mode 100644
index 00000000..ad0f930e
--- /dev/null
+++ b/scripts/useragents/index.php
@@ -0,0 +1,81 @@
+<!doctype html>
+
+<html>
+	<head>
+		<meta charset="utf-8">
+		<title>Useragents</title>
+		
+		<style>
+			body {
+				padding: 40px;
+			}
+		
+			input[type=text] {
+				width: 100%;
+				font-size: 12pt;
+			}
+			
+			textarea {
+				margin: 10px 0;
+				font-size: 12pt;
+				width: 100%;
+				height: 100px;
+			}
+			
+			hr {
+				margin: 40px -40px;
+			}
+		
+		</style>
+	</head>
+	
+	<body>
+		<header>
+			<form action='index.php' method='post'>
+				<div>
+					<input type='text' name='useragent' value='<?php echo isset($_REQUEST['useragent']) ? $_REQUEST['useragent'] : ''; ?>'>
+				</div>
+				<div>
+					<textarea name='headers'><?php echo isset($_REQUEST['headers']) ? $_REQUEST['headers'] : ''; ?></textarea>
+				</div>
+				
+				<input type='submit' value='Detect'>
+			
+			</form>
+			
+			<?php if($_SERVER['REQUEST_METHOD'] == 'POST'): ?>
+			<hr>
+			<div>
+				<pre><?php 
+				
+					include('useragents.lib.php');
+		
+					$headers = array();
+					if (isset($_REQUEST['useragent']) && $_REQUEST['useragent'] != '') $headers['User-Agent'] = $_REQUEST['useragent'];
+					if (isset($_REQUEST['headers']) && $_REQUEST['headers'] != '') {
+						
+						$h = explode("\n", $_REQUEST['headers']);
+						for ($i = 0; $i < count($h); $i++) {
+							@list($k, $v) = explode(':', $h[$i], 2);
+							if ($k != '' && $v != '') {
+								$headers[$k] = trim($v);
+							}
+						}
+					}
+					
+					$detected = new Detected($headers);
+										
+					echo "{\n";
+					if (isset($detected->browser)) echo "\tbrowser: " . htmlentities(json_encode($detected->browser)) . "\n"; 
+					if (isset($detected->engine)) echo "\tengine: " . htmlentities(json_encode($detected->engine)) . "\n"; 
+					if (isset($detected->os)) echo "\tos: " . htmlentities(json_encode($detected->os)) . "\n"; 
+					if (isset($detected->device)) echo "\tdevice: " . htmlentities(json_encode($detected->device)) . "\n"; 
+					echo "}";
+				
+				?></pre>
+			</div>
+			<?php endif; ?>
+		</header>
+	
+	</body>
+</html>
\ No newline at end of file
diff --git a/scripts/useragents/useragents.lib.php b/scripts/useragents/useragents.lib.php
new file mode 100644
index 00000000..5969a520
--- /dev/null
+++ b/scripts/useragents/useragents.lib.php
@@ -0,0 +1,6034 @@
+<?php
+
+	/*
+		Copyright (c) 2010-2013 Niels Leenheer
+		 
+		Permission is hereby granted, free of charge, to any person obtaining
+		a copy of this software and associated documentation files (the
+		"Software"), to deal in the Software without restriction, including
+		without limitation the rights to use, copy, modify, merge, publish,
+		distribute, sublicense, and/or sell copies of the Software, and to
+		permit persons to whom the Software is furnished to do so, subject to
+		the following conditions:
+		 
+		The above copyright notice and this permission notice shall be
+		included in all copies or substantial portions of the Software.
+		
+		THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+		EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+		MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+		NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+		LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+		OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+		WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+	*/
+	
+	
+		
+	define ('TYPE_DESKTOP', 'desktop');
+	define ('TYPE_MOBILE', 'mobile');
+	define ('TYPE_TABLET', 'tablet');
+	define ('TYPE_GAMING', 'gaming');
+	define ('TYPE_EREADER', 'ereader');
+	define ('TYPE_MEDIA', 'media');
+	define ('TYPE_EMULATOR', 'emulator');
+	define ('TYPE_TELEVISION', 'television');
+	define ('TYPE_CAMERA', 'camera');
+	define ('TYPE_POS', 'pos');
+
+	define ('FLAG_GOOGLETV', 1);
+
+	
+	class DeviceModels {
+		static $ANDROID_MODELS = array(
+			/* Generic identifiers */
+			'Android'									=> array( null, null ),		
+			'google sdk'								=> array( null, null, TYPE_EMULATOR ),		
+			'sdk'										=> array( null, null, TYPE_EMULATOR ),
+			'generic'									=> array( null, null ),
+			'generic x86'								=> array( null, null ),
+			
+			/* Development boards and kits */
+			'amd brazos'								=> array( 'AMD', 'Fusion based device' ),
+			'Amlogic M1 reference board'				=> array( 'Amlogic', 'M1 reference board' ),
+			'AML8726M'									=> array( 'Amlogic', 'AML8726-M based device' ),
+			'vexpress a9'								=> array( 'ARM', 'Versatile Express development platform' ),
+			'bcm7231'									=> array( 'Broadcom', 'BCM7231 based device', TYPE_TELEVISION ),
+			'bcm7425'									=> array( 'Broadcom', 'BCM7425 based device', TYPE_TELEVISION ),
+			'bcm7429'									=> array( 'Broadcom', 'BCM7429 based device', TYPE_TELEVISION ),
+			'imx50!'									=> array( 'Freescale', 'i.MX50 based device' ),
+			'imx51!'									=> array( 'Freescale', 'i.MX51 based device' ),
+			'imx53!'									=> array( 'Freescale', 'i.MX53 based device' ),
+			'imx6q!'									=> array( 'Freescale', 'i.MX6Q based device' ),
+			'ODROID-A'									=> array( 'Hardkernel', 'ODROID-A developer tablet', TYPE_TABLET ),
+			'mfld (dv10|dv20|lw00|pr2|pr3)!'			=> array( 'Intel', 'Medfield based device' ),
+			'berlin bg2'								=> array( 'Marvell', 'Armada 1000 based device', TYPE_TELEVISION ),
+			'MStar Amber3'								=> array( 'MStar', 'Amber3 based device' ),
+			'Konka Amber3'								=> array( 'MStar', 'Amber3 based device' ),
+			'mt5396'									=> array( 'Mediatek', 'MT5396 based device', TYPE_TELEVISION ),
+			'bird75v2'									=> array( 'Mediatek', 'MT6575 based device' ),
+			'eagle75v1 2'								=> array( 'Mediatek', 'MT6575 based device' ),
+			'mt6575!'									=> array( 'Mediatek', 'MT6575 based device' ),		
+			'mt8658'									=> array( 'Mediatek', 'MT8658 based device' ),
+			'MBX DVBT reference board (c03ref)'			=> array( 'MXB', 'DVBT reference board', TYPE_TELEVISION ),
+			'NS115' 									=> array( 'Nufront', 'NuSmart 115 based device' ),
+			'NS2816'									=> array( 'Nufront', 'NuSmart 2816 based device' ),
+			'Ventana'									=> array( 'nVidia', 'Tegra Ventana development kit' ),
+			'Cardhu'									=> array( 'nVidia', 'Tegra 3 based device' ),
+			'Panda(Board)?!'							=> array( 'Pandaboard', 'Development Kit' ),
+			'MSM'										=> array( 'Qualcomm', 'Snapdragon based device' ),
+			'msm(7227|7627)!'							=> array( 'Qualcomm', 'Snapdragon S1 based device' ),
+			'msm7630!'									=> array( 'Qualcomm', 'Snapdragon S2 based device' ),
+			'msm8660!'									=> array( 'Qualcomm', 'Snapdragon S3 based device' ),
+			'msm(8625|8960)!'							=> array( 'Qualcomm', 'Snapdragon S4 based device' ),
+			'msm8974!'									=> array( 'Qualcomm', 'Snapdragon based device' ),
+			'rk2808(sdk)?!'								=> array( 'Rockchip', 'RK2808 based device' ),
+			'rk2818(sdk)?!'								=> array( 'Rockchip', 'RK2818 based device' ),
+			'Android-for-Rockchip-2818'					=> array( 'Rockchip', 'RK2818 based device' ),
+			'rk29sdk'									=> array( 'Rockchip', 'RK29 based device' ),
+			'rk30sdk'									=> array( 'Rockchip', 'RK30 based device' ),
+			's3c6410'									=> array( 'Samsung', 'S3C6410 based device' ),
+			'smdk6410'									=> array( 'Samsung', 'S3C6410 based device' ),
+			'SMDKC110'									=> array( 'Samsung', 'Exynos 3110 based device' ),
+			'SMDKV210'									=> array( 'Samsung', 'Exynos 4210 based device' ),
+			'S5PV210'									=> array( 'Samsung', 'Exynos 4210 based device' ),
+			'sec smdkc210'								=> array( 'Samsung', 'Exynos 4210 based device' ),
+			'SMDK4x12'									=> array( 'Samsung', 'Exynos 4212 or 4412 based device' ),
+			'SMDK5250'									=> array( 'Samsung', 'Exynos 5250 based device' ),									
+			'smp86xx'									=> array( 'Sigma', 'SMP86xx based device', TYPE_TELEVISION ),
+			'sv8860'									=> array( 'Skyviia', 'SV8860 based device', TYPE_TELEVISION ),
+			'ste u8500'									=> array( 'ST Ericsson', 'Novathor U8500 based device' ),
+			'Telechips M801 Evaluation Board'			=> array( 'Telechips', 'M801 based device', TYPE_TELEVISION ),
+			'Telechips TCC8900 Evaluation Board'		=> array( 'Telechips', 'TCC8900 based device', TYPE_TELEVISION ),
+			'TCC8920 STB EV'							=> array( 'Telechips', 'TCC8920 based device', TYPE_TELEVISION ),
+			'OMAP'										=> array( 'Texas Instruments', 'OMAP based device' ),
+			'OMAP SS'									=> array( 'Texas Instruments', 'OMAP based device' ),
+			'LogicPD Zoom2'								=> array( 'Texas Instruments', 'OMAP based device' ),
+			'omap3evm'									=> array( 'Texas Instruments', 'OMAP3 based device' ),
+			'Omap5sevm'									=> array( 'Texas Instruments', 'OMAP5 based device' ),
+			'pnx8473 kiryung'							=> array( 'Trident', 'PNX8473 based device', TYPE_TELEVISION ),
+			
+			/* Official Google development devices */
+			'Bravo'										=> array( 'HTC', 'Desire' ),
+			'Dream'										=> array( 'HTC', 'Dream' ),
+			'Vogue'										=> array( 'HTC', 'Touch' ),
+			'Vendor Optimus'							=> array( 'LG', 'Optimus' ),
+			'Stingray'									=> array( 'Motorola', 'XOOM', TYPE_TABLET ),
+			'Wingray'									=> array( 'Motorola', 'XOOM', TYPE_TABLET ),
+			'Blaze'										=> array( 'Texas Instruments', 'Blaze Tablet', TYPE_TABLET ),
+			'Blaze Tablet'								=> array( 'Texas Instruments', 'Blaze Tablet', TYPE_TABLET ),
+			'Google Ion'								=> array( 'Google', 'Ion' ),
+
+
+			/* Nexus Devices (without official model no. */
+			'Passion'									=> array( 'HTC', 'Nexus One' ),
+			'(HTC )?Nexus ?One!'						=> array( 'HTC', 'Nexus One' ),
+			'Crespo!'									=> array( 'Samsung', 'Nexus S' ),
+			'(Google )?Nexus S!'						=> array( 'Samsung', 'Nexus S' ),
+			'Dooderbutt!'								=> array( 'Samsung', 'Nexus S' ),
+			'Maguro'									=> array( 'Samsung', 'Galaxy Nexus' ),
+			'Toro-VZW'									=> array( 'Samsung', 'Galaxy Nexus' ),
+			'Galaxy Nexus'								=> array( 'Samsung', 'Galaxy Nexus' ),
+			'Grouper'									=> array( 'Asus', 'Nexus 7', TYPE_TABLET ),
+			'(Google )?Nexus 7!'						=> array( 'Asus', 'Nexus 7', TYPE_TABLET ),
+			'Nexus 4'									=> array( 'LG', 'Nexus 4' ),
+			'manta'										=> array( 'Samsung', 'Nexus 10', TYPE_TABLET ),
+			'Nexus 10'									=> array( 'Samsung', 'Nexus 10', TYPE_TABLET ),
+
+			
+			/* Middleware and emulators */
+			'BlueStacks'								=> array( 'BlueStacks', 'App Player', 'desktop' ),
+			'youwave custom'							=> array( 'Youwave', 'Android on PC', 'desktop' ),
+			'BlackBerry Runtime for Android Apps'		=> array( 'RIM', 'BlackBerry (Android Runtime)', TYPE_MOBILE ),
+			
+			/* Regular devices */
+			'RC0710B'									=> array( '3Q', 'Qoo! Q-Pad RC0710B', TYPE_TABLET ),
+			'TS1009B'									=> array( '3Q', 'Qoo! Surf Tablet TS1009B', TYPE_TABLET ),
+			'aspire1000s'								=> array( 'Acer', '1000 Series', TYPE_DESKTOP ),
+			'A100'										=> array( 'Acer', 'Iconia Tab A100', TYPE_TABLET ),
+			'A101'										=> array( 'Acer', 'Iconia Tab A101', TYPE_TABLET ),
+			'A110'										=> array( 'Acer', 'Iconia Tab A110', TYPE_TABLET ),
+			'A200'										=> array( 'Acer', 'Iconia Tab A200', TYPE_TABLET ),
+			'A210'										=> array( 'Acer', 'Iconia Tab A210', TYPE_TABLET ),
+			'A211'										=> array( 'Acer', 'Iconia Tab A211', TYPE_TABLET ),
+			'A500'										=> array( 'Acer', 'Iconia Tab A500', TYPE_TABLET ),
+			'A501'										=> array( 'Acer', 'Iconia Tab A501', TYPE_TABLET ),
+			'A510'										=> array( 'Acer', 'Iconia Tab A510', TYPE_TABLET ),
+			'A511'										=> array( 'Acer', 'Iconia Tab A511', TYPE_TABLET ),
+			'A700'										=> array( 'Acer', 'Iconia Tab A700', TYPE_TABLET ),
+			'P2A700'									=> array( 'Acer', 'Iconia Tab A700', TYPE_TABLET ),
+			'A701'										=> array( 'Acer', 'Iconia Tab A701', TYPE_TABLET ),
+			'A800'										=> array( 'Acer', 'Iconia Tab A800', TYPE_TABLET ),
+			'E110'										=> array( 'Acer', 'beTouch E110' ),
+			'E120'										=> array( 'Acer', 'beTouch E120' ),
+			'E130'										=> array( 'Acer', 'beTouch E130' ),
+			'E140'										=> array( 'Acer', 'beTouch E140' ),
+			'E210'										=> array( 'Acer', 'beTouch E210' ),
+			'E310'										=> array( 'Acer', 'Liquid mini' ),
+			'E320'										=> array( 'Acer', 'Liquid Express' ),
+			'E330'										=> array( 'Acer', 'Liquid Glow' ),
+			'E350'										=> array( 'Acer', 'Liquid Gallant' ),
+			'E400'										=> array( 'Acer', 'beTouch E400' ),
+			'G100W'										=> array( 'Acer', 'G100W' ),
+			'S100'										=> array( 'Acer', 'Liquid' ),
+			'S110'										=> array( 'Acer', 'Stream' ),
+			'S120'										=> array( 'Acer', 'Liquid mt' ),
+			'S300'										=> array( 'Acer', 'Iconia Smart' ),
+			'S500'										=> array( 'Acer', 'CloudMobile' ),
+			'Z110'										=> array( 'Acer', 'Liquid Z110' ),
+			'TD600'										=> array( 'Acer', 'beTouch TD600' ),
+			'Liquid'									=> array( 'Acer', 'Liquid' ),
+			'Liquid E'									=> array( 'Acer', 'Liquid E' ),
+			'Liquid MT'									=> array( 'Acer', 'Liquid mt' ),
+			'Liquid Metal'								=> array( 'Acer', 'Liquid mt' ),
+			'Stream'									=> array( 'Acer', 'Stream' ),
+			'AK330s'									=> array( 'Acer', 'AK330s' ),
+			'N700'										=> array( 'aigo', 'N700', TYPE_TABLET ),
+			'M801'										=> array( 'aigo', 'M801', TYPE_TABLET ),
+			'Novo7'										=> array( 'Ainovo', 'Novo7', TYPE_TABLET ),
+			'Novo7 Aurora'								=> array( 'Ainovo', 'Novo7 Aurora', TYPE_TABLET ),
+			'Novo7 Advanced'							=> array( 'Ainovo', 'Novo7 Advanced', TYPE_TABLET ),
+			'Novo7 Advanced2'							=> array( 'Ainovo', 'Novo7 Advanced 2', TYPE_TABLET ),
+			'Novo7 Basic'								=> array( 'Ainovo', 'Novo7 Basic', TYPE_TABLET ),
+			'Novo7 ELF'									=> array( 'Ainovo', 'Novo7 Elf', TYPE_TABLET ),
+			'Novo7 Fire'								=> array( 'Ainovo', 'Novo7 Fire', TYPE_TABLET ),
+			'Novo7 Flame'								=> array( 'Ainovo', 'Novo7 Flame', TYPE_TABLET ),
+			'Ainovo Flame (Nexus 7)'					=> array( 'Ainovo', 'Novo7 Flame', TYPE_TABLET ),
+			'Novo7 PALADIN'								=> array( 'Ainovo', 'Novo7 Paladin', TYPE_TABLET ),
+			'Novo8 Advanced'							=> array( 'Ainovo', 'Novo8 Advanced', TYPE_TABLET ),
+			'Novo10 Hero'								=> array( 'Ainovo', 'Novo10 Hero', TYPE_TABLET ),
+			'one touch 890!'							=> array( 'Alcatel', 'One Touch 890' ),
+			'one touch 891!'							=> array( 'Alcatel', 'One Touch 891' ),
+			'one touch 903!'							=> array( 'Alcatel', 'One Touch 903' ),
+			'one touch 906!'							=> array( 'Alcatel', 'One Touch 906' ),
+			'one touch 908!'							=> array( 'Alcatel', 'One Touch 908' ),
+			'one touch 910!'							=> array( 'Alcatel', 'One Touch 910' ),
+			'one touch 918!'							=> array( 'Alcatel', 'One Touch 918' ),
+			'one touch 979!'							=> array( 'Alcatel', 'One Touch 979' ),
+			'one touch 980!'							=> array( 'Alcatel', 'One Touch 980' ),
+			'one touch 981!'							=> array( 'Alcatel', 'One Touch 981' ),
+			'one touch 985!'							=> array( 'Alcatel', 'One Touch 985' ),
+			'one touch 986!'							=> array( 'Alcatel', 'One Touch 986' ),
+			'one touch 990!'							=> array( 'Alcatel', 'One Touch 990' ),
+			'one touch 991!'							=> array( 'Alcatel', 'One Touch 991' ),
+			'one touch 993!'							=> array( 'Alcatel', 'One Touch 993' ),
+			'one touch 995!'							=> array( 'Alcatel', 'One Touch 995' ),
+			'one touch 997!'							=> array( 'Alcatel', 'One Touch 997' ),
+			'Telenor OneTouch'							=> array( 'Alcatel', 'One Touch 990' ),
+			'OT 918'									=> array( 'Alcatel', 'One Touch 918' ),
+			'Venture'									=> array( 'Alcatel', 'Venture' ),
+			'Allwinner A10'								=> array( 'AllWinner', 'A10', TYPE_TABLET ),
+			'97FC'										=> array( 'AllWinner', 'A10 97FC', TYPE_TABLET ),
+			'A13-?MID!'									=> array( 'AllWinner', 'A13', TYPE_TABLET ),
+			'AT108F'									=> array( 'Aluratek', 'Cinepad AT108F', TYPE_TABLET ),
+			'(Amazon )?Kindle Fire!'					=> array( 'Amazon', 'Kindle Fire', TYPE_TABLET ),
+			'KFOT'										=> array( 'Amazon', 'Kindle Fire', TYPE_TABLET ),	
+			'KFTT'										=> array( 'Amazon', 'Kindle Fire HD 7"', TYPE_TABLET ),
+			'KFJW(I|A)!'								=> array( 'Amazon', 'Kindle Fire HD 8.9"', TYPE_TABLET ),
+			'AMOI N89'									=> array( 'Amoi', 'N89' ),
+			'AMOI N820'									=> array( 'Amoi', 'N820' ),
+			'AMOI N821'									=> array( 'Amoi', 'N821' ),
+			'AMD120'									=> array( 'AnyDATA', 'AnyTAB AMD120', TYPE_TABLET ),
+			'MW0711'									=> array( 'AOC', 'Breeze MW0711', TYPE_TABLET ),
+			'MW0811'									=> array( 'AOC', 'Breeze MW0811', TYPE_TABLET ),
+			'MW0821 V2.0'								=> array( 'AOC', 'Breeze MW0821', TYPE_TABLET ),
+			'MW0922'									=> array( 'AOC', 'Breeze MW0922', TYPE_TABLET ),
+			'AOLE 828'									=> array( 'Aole', '828' ),
+			'Apanda.A60!'								=> array( 'Apanda', 'A60' ),
+			'apanda-A80S'								=> array( 'Apanda', 'A80' ),
+			'Quicki-811'								=> array( 'Apollo', 'Quicki-811', TYPE_TABLET ),
+			'A80KSC!'									=> array( 'Archos', 'Arnova 8', TYPE_TABLET ),
+			'AN7CG2'									=> array( 'Archos', 'Arnova 7', TYPE_TABLET ),
+			'AN7G3'										=> array( 'Archos', 'Arnova 7 G3', TYPE_TABLET ),
+			'A101B'										=> array( 'Archos', 'Arnova 10', TYPE_TABLET ),
+			'AN10BG2DT'									=> array( 'Archos', 'Arnova 10 B', TYPE_TABLET ),
+			'AN10G2'									=> array( 'Archos', 'Arnova 10 G2', TYPE_TABLET ),
+			'A32'										=> array( 'Archos', '32', 'media' ),
+			'A35DE'										=> array( 'Archos', '35 Smart Home Phone' ),
+			'A43'										=> array( 'Archos', '43', 'media' ),
+			'Archos5'									=> array( 'Archos', '5', 'media' ),
+			'A70H'										=> array( 'Archos', '7 Home Tablet', TYPE_TABLET ),					// G7
+			'A70HB'										=> array( 'Archos', '7 Home Tablet', TYPE_TABLET ),
+			'A70BHT'									=> array( 'Archos', '7 Home Tablet', TYPE_TABLET ),
+			'A70CHT'									=> array( 'Archos', '7 Home Tablet', TYPE_TABLET ),
+			'A70S'										=> array( 'Archos', '70 Internet Tablet', TYPE_TABLET ),				// G8
+			'A7EB'										=> array( 'Archos', '70B Internet Tablet', TYPE_TABLET ),
+			'ARCHOS 70it2'								=> array( 'Archos', '70B Internet Tablet', TYPE_TABLET ),		
+			'A101IT'									=> array( 'Archos', '101 Internet Tablet', TYPE_TABLET ),		
+			'ARCHOS 80G9'								=> array( 'Archos', '80 G9', TYPE_TABLET ),							// G9
+			'ARCHOS 101G9'								=> array( 'Archos', '101 G9', TYPE_TABLET ),						
+			'ARCHOS 97XSLG10'							=> array( 'Archos', '97 XS', TYPE_TABLET ),							// G10
+			'ARCHOS 101G10'								=> array( 'Archos', '101 XS', TYPE_TABLET ),
+			'ARCHOS 80 COBALT'							=> array( 'Archos', '80 Cobalt', TYPE_TABLET ),						// Elements
+			'ARCHOS 97 CARBON'							=> array( 'Archos', '97 Carbon', TYPE_TABLET ),						// Elements
+			'D9702'										=> array( 'Artes', 'D9702', TYPE_TABLET ),
+			'ASTRI'										=> array( 'ASTRI', 'e-reader', TYPE_EREADER ),
+			'eeepc'										=> array( 'Asus', 'Eee Pc' ),
+			'asus laptop'								=> array( 'Asus', 'Eee Pc' ),
+			'ME171'										=> array( 'Asus', 'Eee Pad MeMO', TYPE_TABLET ),
+			'Slider SL101'								=> array( 'Asus', 'Eee Pad Slider', TYPE_TABLET ),
+			'EPAD'										=> array( 'Asus', 'Eee Pad Transformer', TYPE_TABLET ),
+			'TF101'										=> array( 'Asus', 'Eee Pad Transformer', TYPE_TABLET ),
+			'Transformer'								=> array( 'Asus', 'Eee Pad Transformer', TYPE_TABLET ),
+			'Transformer TF101(G)?!'					=> array( 'Asus', 'Eee Pad Transformer', TYPE_TABLET ),
+			'TF201'										=> array( 'Asus', 'Eee Pad Transformer Prime', TYPE_TABLET ),
+			'(Eee Pad )?Transformer Prime TF201!'		=> array( 'Asus', 'Eee Pad Transformer Prime', TYPE_TABLET ),
+			'Transformer Prime'							=> array( 'Asus', 'Eee Pad Transformer Prime', TYPE_TABLET ),
+			'(Transformer )?(Pad )?TF300(T|TG|TL)!'		=> array( 'Asus', 'Transformer Pad 300', TYPE_TABLET ),
+			'(Transformer )?(Pad )?TF700(T|K)!'			=> array( 'Asus', 'Transformer Pad Infinity 700', TYPE_TABLET ),
+			'PadFone'									=> array( 'Asus', 'Padfone', TYPE_TABLET ),
+			'PadFone 2'									=> array( 'Asus', 'Padfone 2', TYPE_TABLET ),
+			'OMS TTD'									=> array( 'Asus', 'Eee Pc T10' ),
+			'ASUS T20'									=> array( 'Asus', 'Eee Pc T20' ),
+			'ETBW11AA'									=> array( 'Asus', 'Tough' ),
+			'AUX V900'									=> array( 'AUX', 'V900' ),
+			'PICOpad-QGN'								=> array( 'Axioo', 'Picopad QGN', TYPE_TABLET ),
+			'A10 MID'									=> array( 'Azhuo', 'A10 MID', TYPE_TABLET ),
+			'NOOK'										=> array( 'Barnes & Noble', 'NOOK', TYPE_EREADER ),
+			'Nook ?Color!'								=> array( 'Barnes & Noble', 'NOOK Color', TYPE_EREADER ),
+			'(NOOK )?BNRV(200|300)!'					=> array( 'Barnes & Noble', 'NOOK Color', TYPE_EREADER ),
+			'Nook ?Tablet!'								=> array( 'Barnes & Noble', 'NOOK Tablet', TYPE_EREADER ),
+			'NOOK Slate'								=> array( 'Barnes & Noble', 'NOOK Tablet', TYPE_EREADER ),
+			'Barnes & Noble Nook Tablet'				=> array( 'Barnes & Noble', 'NOOK Tablet', TYPE_EREADER ),
+			'(NOOK )?BNTV250!'							=> array( 'Barnes & Noble', 'NOOK Tablet', TYPE_EREADER ),
+			'(NOOK )?BNRV350!'							=> array( 'Barnes & Noble', 'NOOK Simple Touch', TYPE_EREADER ),
+			'(NOOK )?BNTV(400)!'						=> array( 'Barnes & Noble', 'NOOK HD Tablet', TYPE_EREADER ),
+			'(NOOK )?BNTV(600)!'						=> array( 'Barnes & Noble', 'NOOK HD+ Tablet', TYPE_EREADER ),
+			'Barnes & Noble Nook HD+'					=> array( 'Barnes & Noble', 'NOOK HD+ Tablet', TYPE_EREADER ),
+			'BenWee 5100'								=> array( 'BenWee', '5100' ),
+			'CA907AAC0G'								=> array( 'Besta', 'CA907AAC0G' ),
+			'(BLU )?VIVO 4.3!'							=> array( 'BLU', 'Vivo 4.3' ),
+			'BM999'										=> array( 'Bmorn', 'BM999', TYPE_TABLET ),
+			'V11'										=> array( 'Bmorn', 'V11', TYPE_TABLET ),
+			'V99'										=> array( 'Bmorn', 'V99', TYPE_TABLET ),
+			'BROR W60'									=> array( 'BROR', 'W60' ),
+			'bq DaVinci'								=> array( 'bq', 'DaVinci', TYPE_TABLET ),
+			'Maxwell Lite'								=> array( 'bq', 'Maxwell Lite', TYPE_TABLET ),
+			'CT704'										=> array( 'Carrefour', 'CT704', TYPE_TABLET ),
+			'CT1002'									=> array( 'Carrefour', 'CT1002', TYPE_TABLET ),
+			'Camangi-Mangrove7'							=> array( 'Camangi', 'Mangrove 7', TYPE_TABLET ),
+			'WS171'										=> array( 'Camangi', 'WebStation', TYPE_TABLET ),
+			'IS11CA'									=> array( 'Casio', 'GzOne IS11CA' ),
+			'C771'										=> array( 'Casio', 'GzOne Commando' ),
+			'VX-100'									=> array( 'Casio', 'VX-100 EPOS Terminal', TYPE_POS ),
+			'CAT NOVA'									=> array( 'Cat', 'NOVA', TYPE_TABLET ),
+			'W820'										=> array( 'Cellon', 'HW-W820' ),
+			'ChangHong-Z-ME'							=> array( 'ChangHong', 'Z-me' ),
+			'Changhong H5018'							=> array( 'ChangHong', 'H5018' ),
+			'ARMM3V'									=> array( 'chinaleap', 'ARMM3V', TYPE_TABLET ),
+			'CIUS-7!'									=> array( 'Cisco', 'Cius', TYPE_TABLET ),
+			'CSL Spice MI300'							=> array( 'CSL', 'Spice MI300' ),
+			'CSL-MI410'									=> array( 'CSL', 'Spice MI410' ),
+			'MID1024'									=> array( 'Coby', 'Kyros MID1024', TYPE_TABLET ),
+			'MID1125'									=> array( 'Coby', 'Kyros MID1125', TYPE_TABLET ),
+			'MID1126'									=> array( 'Coby', 'Kyros MID1126', TYPE_TABLET ),
+			'MID7010'									=> array( 'Coby', 'Kyros MID7010', TYPE_TABLET ),
+			'MID7012'									=> array( 'Coby', 'Kyros MID7012', TYPE_TABLET ),
+			'MID7015!'									=> array( 'Coby', 'Kyros MID7015', TYPE_TABLET ),
+			'MID7016'									=> array( 'Coby', 'Kyros MID7016', TYPE_TABLET ),
+			'MID7020'									=> array( 'Coby', 'Kyros MID7020', TYPE_TABLET ),
+			'MID7022'									=> array( 'Coby', 'Kyros MID7022', TYPE_TABLET ),
+			'MID7024'									=> array( 'Coby', 'Kyros MID7024', TYPE_TABLET ),
+			'MID7025'									=> array( 'Coby', 'Kyros MID7025', TYPE_TABLET ),
+			'MID7034'									=> array( 'Coby', 'Kyros MID7034', TYPE_TABLET ),
+			'MID7035'									=> array( 'Coby', 'Kyros MID7035', TYPE_TABLET ),
+			'MID7127'									=> array( 'Coby', 'Kyros MID7127', TYPE_TABLET ),
+			'MID8024'									=> array( 'Coby', 'Kyros MID8024', TYPE_TABLET ),
+			'MID8125'									=> array( 'Coby', 'Kyros MID8125', TYPE_TABLET ),
+			'MID8127'									=> array( 'Coby', 'Kyros MID8127', TYPE_TABLET ),
+			'Z71'										=> array( 'Commtiva', 'Z71' ),
+			'V-T100'									=> array( 'Commtiva', 'V-T100' ),
+			'FIH-FB0'									=> array( 'Commtiva', 'HD700'),
+			'Coolpad D510'								=> array( 'Coolpad', 'D510' ),
+			'D530'										=> array( 'Coolpad', 'D530' ),
+			'Coolpad D530'								=> array( 'Coolpad', 'D530' ),
+			'D539'										=> array( 'Coolpad', 'D539' ),
+			'Coolpad D539'								=> array( 'Coolpad', 'D539' ),
+			'E239'										=> array( 'Coolpad', 'E239' ),
+			'Coolpad E239'								=> array( 'Coolpad', 'E239' ),
+			'Coolpad N930'								=> array( 'Coolpad', 'N930' ),
+			'N930'										=> array( 'Coolpad', 'N930' ),
+			'Coolpad W706!'								=> array( 'Coolpad', 'W706' ),
+			'Coolpad W708'								=> array( 'Coolpad', 'W708' ),
+			'W711'										=> array( 'Coolpad', 'W711' ),
+			'Coolpad 5210'								=> array( 'Coolpad', '5210' ),
+			'Coolpad 5210S'								=> array( 'Coolpad', '5210S' ),
+			'Coolpad 5216'								=> array( 'Coolpad', '5216' ),
+			'Coolpad 5820'								=> array( 'Coolpad', '5820' ),
+			'5832'										=> array( 'Coolpad', '5832' ),
+			'Coolpad 5832'								=> array( 'Coolpad', '5832' ),
+			'5855'										=> array( 'Coolpad', '5855' ),
+			'Coolpad 5860!'								=> array( 'Coolpad', '5860' ),
+			'5860'										=> array( 'Coolpad', '5860' ),
+			'Coolpad 5870'								=> array( 'Coolpad', '5870' ),
+			'Coolpad 7005'								=> array( 'Coolpad', '7005' ),
+			'Coolpad 7019!'								=> array( 'Coolpad', '7019' ),
+			'Coolpad 7230'								=> array( 'Coolpad', '7230' ),
+			'7260'										=> array( 'Coolpad', '7260' ),
+			'Coolpad 7260!'								=> array( 'Coolpad', '7260' ),
+			'7266'										=> array( 'Coolpad', '7266' ),
+			'Coolpad 8013'								=> array( 'Coolpad', '8013' ),
+			'Coolpad 8026'								=> array( 'Coolpad', '8026' ),
+			'Coolpad 8809'								=> array( 'Coolpad', '8809' ),
+			'Coolpad 8810'								=> array( 'Coolpad', '8810' ),
+			'8810'										=> array( 'Coolpad', '8810' ),
+			'Coolpad 8811'								=> array( 'Coolpad', '8811' ),
+			'Coolpad 9120'								=> array( 'Coolpad', '9120' ),
+			'Coolpad 9900'								=> array( 'Coolpad', '9900' ),
+			'Coolpad 9960'								=> array( 'Coolpad', '9960' ),
+			'ZiiO7'										=> array( 'Creative', 'ZiiO 7', TYPE_TABLET ),
+			'ZiiLABS ZiiO7'								=> array( 'Creative', 'ZiiO 7', TYPE_TABLET ),
+			'ZiiLABS ZiiO10 '							=> array( 'Creative', 'ZiiO 10', TYPE_TABLET ),
+			'CUBE K8GT A'								=> array( 'Cube', 'K8GT A', TYPE_TABLET ),
+			'CUBE K8GT B'								=> array( 'Cube', 'K8GT B', TYPE_TABLET ),
+			'K8GT C'									=> array( 'Cube', 'K8GT C', TYPE_TABLET ),
+			'K8GT H'									=> array( 'Cube', 'K8GT H', TYPE_TABLET ),
+			'CUBE K8GT H'								=> array( 'Cube', 'K8GT H', TYPE_TABLET ),
+			'K8GT W'									=> array( 'Cube', 'K8GT W', TYPE_TABLET ),
+			'CUBE U8GT'									=> array( 'Cube', 'U8GT', TYPE_TABLET ),
+			'CUBE U9GT'									=> array( 'Cube', 'U9GT', TYPE_TABLET ),
+			'CUBE U9GT ?2!'								=> array( 'Cube', 'U9GT 2', TYPE_TABLET ),
+			'U9GT'										=> array( 'Cube', 'U9GT', TYPE_TABLET ),
+			'U9GT2!'									=> array( 'Cube', 'U9GT 2', TYPE_TABLET ),
+			'N90 From moage.com'						=> array( 'Cube', 'U9GT 2', TYPE_TABLET ),
+			'U9GT3'										=> array( 'Cube', 'U9GT 3', TYPE_TABLET ),
+			'U9GT S'									=> array( 'Cube', 'U9GT S', TYPE_TABLET ),
+			'U9GT S A'									=> array( 'Cube', 'U9GT SA', TYPE_TABLET ),
+			'U9GTS A'									=> array( 'Cube', 'U9GT SA', TYPE_TABLET ),
+			'U10GT 2'									=> array( 'Cube', 'U10GT 2', TYPE_TABLET ),
+			'U10GT S'									=> array( 'Cube', 'U10GT S', TYPE_TABLET ),
+			'CUBE U15GT'								=> array( 'Cube', 'U15GT', TYPE_TABLET ),
+			'U18GT2'									=> array( 'Cube', 'U18GT 2', TYPE_TABLET ),
+			'U23GT'										=> array( 'Cube', 'U23GT', TYPE_TABLET ),
+			'U30GT-H'									=> array( 'Cube', 'U30GT H', TYPE_TABLET ),
+			'U30GT-M'									=> array( 'Cube', 'U30GT M', TYPE_TABLET ),
+			'U30GT MINI'								=> array( 'Cube', 'U30GT Mini', TYPE_TABLET ),
+			'CUBE Q7PRO'								=> array( 'Cube', 'Q7 Pro', TYPE_TABLET ),
+			'CUBE Q7PRO J'								=> array( 'Cube', 'Q7 Pro', TYPE_TABLET ),
+			'Cydle M7!'									=> array( 'Cydle', 'M7 MultiPAD', TYPE_TABLET ),
+			'HB-100 DASAN'								=> array( 'Dasan', 'HB-100', TYPE_TELEVISION ),
+			'Dell Aero'									=> array( 'Dell', 'Aero' ),
+			'Dell M01M'									=> array( 'Dell', 'Mini 5', TYPE_TABLET ),
+			'Dell Streak'								=> array( 'Dell', 'Streak', TYPE_TABLET ),
+			'001DL'										=> array( 'Dell', 'Streak', TYPE_TABLET ),
+			'101DL'										=> array( 'Dell', 'Streak Pro', TYPE_TABLET ),
+			'GS01'										=> array( 'Dell', 'Streak Pro', TYPE_TABLET ),
+			'Dell Streak Pro'							=> array( 'Dell', 'Streak Pro', TYPE_TABLET ),
+			'streak7'									=> array( 'Dell', 'Streak 7', TYPE_TABLET ),
+			'Dell Streak 7'								=> array( 'Dell', 'Streak 7', TYPE_TABLET ),
+			'Dell Streak 10 Pro'						=> array( 'Dell', 'Streak 10 Pro', TYPE_TABLET ),
+			'Dell V04B'									=> array( 'Dell', 'Streak V04B', TYPE_TABLET ),
+			'Dell Venue'								=> array( 'Dell', 'Venue' ),
+			'Dell XCD35'								=> array( 'Dell', 'XCD35' ),
+			'XCD35'										=> array( 'Dell', 'XCD35' ),
+			'deovo V5'									=> array( 'deovo', 'V5' ),
+			'iDx7'										=> array( 'Digma', 'iDx7', TYPE_TABLET ),
+			'iDx10!'									=> array( 'Digma', 'iDx10', TYPE_TABLET ),
+			'DM009SH'									=> array( 'Disney Mobile', 'DM009SH' ),
+			'DM010SH'									=> array( 'Disney Mobile', 'DM010SH' ),
+			'DM012SH'									=> array( 'Disney Mobile', 'DM012SH' ),
+			'F-08D'										=> array( 'Disney Mobile', 'F-08D' ),
+			'P-05D'										=> array( 'Disney Mobile', 'P-05D' ),
+			'domod G20'									=> array( 'Domod', 'G20' ),
+			'TD-1010'									=> array( 'Double Power', 'TD-1010', TYPE_TABLET ),
+			'Tablet-P27'								=> array( 'DracoTek', 'P27 Tablet', TYPE_TABLET ),
+			'ACM3066-8'									=> array( 'MY|eebo', 'Color Tablet', TYPE_TABLET ),
+			'edgejr'									=> array( 'EnTourage', 'Pocket eDGe', TYPE_TABLET ),
+			'l97D'										=> array( 'EPad', 'l97D', TYPE_TABLET ),
+			'epade A360S'								=> array( 'epade', 'A360S' ),
+			'M4301'										=> array( 'Eston', 'MID M4301', 'media' ),
+			'P10AN'										=> array( 'Exper', 'Easypad P10AN', TYPE_TABLET ),
+			'Informer-702'								=> array( 'Explay', 'Informer 702', TYPE_TABLET ),
+			'FIH-F0X'									=> array( 'FIH', 'F0X' ),
+			'Fly IQ245'									=> array( 'Fly', 'IQ245 Wizard' ),
+			'Fly IQ260'									=> array( 'Fly', 'IQ260 BlackBird' ),
+			'Fly IQ285'									=> array( 'Fly', 'IQ285 Turbo' ),
+			'(Fly )?IQ440!'								=> array( 'Fly', 'IQ440 Energie' ),
+			'(Fly )?IQ441!'								=> array( 'Fly', 'IQ441 Radiance' ),
+			'Fly IQ442'									=> array( 'Fly', 'IQ442 Miracle' ),
+			'NABI2-NV7A'								=> array( 'Fuhu', 'NABI', TYPE_TABLET ),
+			'ISW11F'									=> array( 'Fujitsu', 'Arrows Z' ),
+			'ISW13F'									=> array( 'Fujitsu', 'Arrows Z' ),
+			'IS12F'										=> array( 'Fujitsu', 'Arrows ES' ),
+			'F-01D'										=> array( 'Fujitsu', 'Arrows Tab LTE', TYPE_TABLET ),
+			'F-03D'										=> array( 'Fujitsu', 'Arrows Kiss' ),
+			'F-05D'										=> array( 'Fujitsu', 'Arrows X LTE' ),
+			'F-07D'										=> array( 'Fujitsu', 'Arrows μ' ),
+			'F-10D'										=> array( 'Fujitsu', 'Arrows X F-10D' ),
+			'F-11D'										=> array( 'Fujitsu', 'Arrows Me' ),
+			'F-12C'										=> array( 'Fujitsu', 'Globetrotter' ),
+			'f12arc'									=> array( 'Fujitsu', 'F12arc' ),
+			'M532'										=> array( 'Fujitsu', 'Stylistic M532', TYPE_TABLET ),
+			'Garminfone'								=> array( 'Garmin-Asus', 'Garminfone' ),
+			'Garmin-Asus A10'							=> array( 'Garmin-Asus', 'Nuvifone A10' ),
+			'Garmin-Asus A50'							=> array( 'Garmin-Asus', 'Nuvifone A50' ),
+			'TPA60W'									=> array( 'Gateway', 'TPA60W', TYPE_TABLET ),
+			'Geeksphone ZERO'							=> array( 'Geeksphone', 'ZERO'),
+			'Gemei G2'									=> array( 'Gemei', 'G2', TYPE_TABLET ),
+			'Gemei G3'									=> array( 'Gemei', 'G3', TYPE_TABLET ),
+			'Gemei G9'									=> array( 'Gemei', 'G9', TYPE_TABLET ),
+			'GEM7008'									=> array( 'Gemini', 'JoyTab GEM7008', TYPE_TABLET ),
+			'GSmart G1317D'								=> array( 'Gigabyte', 'GSmart G1317D' ),
+			'GSmart G1342'								=> array( 'Gigabyte', 'GSmart G1342' ),
+			'GSmart G1345'								=> array( 'Gigabyte', 'GSmart G1345' ),
+			'GSmart G1362'								=> array( 'Gigabyte', 'GSmart G1362' ),
+			'Gigabyte TB100'							=> array( 'Gigabyte', 'TB100', TYPE_TABLET ),
+			'GIO-GiONEE C500'							=> array( 'Gionee', 'C500' ),
+			'GIO-GiONEE C600'							=> array( 'Gionee', 'C600' ),
+			'GN100'										=> array( 'Gionee', 'GN100' ),		
+			'GN105'										=> array( 'Gionee', 'GN105' ),		
+			'GN109'										=> array( 'Gionee', 'GN109' ),
+			'GN180'										=> array( 'Gionee', 'GN180' ),
+			'GN200'										=> array( 'Gionee', 'GN200' ),		
+			'GN205'										=> array( 'Gionee', 'GN205' ),
+			'GN305'										=> array( 'Gionee', 'GN305' ),
+			'GN360'										=> array( 'Gionee', 'GN360' ),
+			'GN700T'									=> array( 'Gionee', 'GN700T' ),
+			'GN700W'									=> array( 'Gionee', 'GN700W' ),
+			'GN858'										=> array( 'Gionee', 'GN858' ),
+			'GOCLEVER TAB A103'							=> array( 'Goclever', 'TAB A103', TYPE_TABLET ),
+			'GOCLEVER TAB A104'							=> array( 'Goclever', 'TAB A104', TYPE_TABLET ),
+			'Haier-HT-I617'								=> array( 'Haier', 'HT-I617' ),
+			'Haier HW-W910'								=> array( 'Haier', 'HW-W910' ),
+			'W718'										=> array( 'Haier', 'W718' ),
+			'I9220'										=> array( 'Haipai', 'I9220' ),
+			'X720D'										=> array( 'Haipai', 'X720D' ),
+			'SN10T1'									=> array( 'HANNspree', 'HANNSpad SN10T1', TYPE_TABLET ),
+			'SN10T2'									=> array( 'HANNspree', 'HANNSpad SN10T2', TYPE_TABLET ),
+			'HannsComb'									=> array( 'HANNspree', 'HANNSpad', TYPE_TABLET ),
+			'X1'										=> array( 'HCL', 'ME X1', TYPE_TABLET ),
+			'MID Ser(ai|ia)ls!'							=> array( 'Herotab', 'C8', TYPE_TABLET ),
+			'HILIVE H7'									=> array( 'Hilive', 'H7' ),
+			'HS-7DTB6-4GB'								=> array( 'Hipstreet', '7" Aurora tablet', TYPE_TABLET ),
+			'HS-9DTB4'									=> array( 'Hipstreet', '9" Flare tablet', TYPE_TABLET ),
+			'COSMO DUO'									=> array( 'Hiscreen', 'Cosmo DUO', TYPE_TABLET ),
+			'HS-U8'										=> array( 'Hisense', 'U8' ),
+			'HS-U950'									=> array( 'Hisense', 'U950' ),
+			'HS-T92'									=> array( 'Hisense', 'T92' ),
+			'T92'										=> array( 'Hisense', 'T92' ),
+			'HS-T96'									=> array( 'Hisense', 'T96' ),
+			'HS-T909'									=> array( 'Hisense', 'T909' ),
+			'HS-E860'									=> array( 'Hisense', 'E860' ),
+			'E860'										=> array( 'Hisense', 'E860' ),
+			'HS-E910'									=> array( 'Hisense', 'E910' ),
+			'HS-E920'									=> array( 'Hisense', 'E920' ),
+			'HS-E926'									=> array( 'Hisense', 'E926' ),
+			'HS-EG900'									=> array( 'Hisense', 'EG900' ),
+			'HS-EG906'									=> array( 'Hisense', 'EG906' ),
+			'AD683G'									=> array( 'Hisense', 'EG909' ),
+			'HS-ET919'									=> array( 'Hisense', 'ET919' ),
+			'EG968B'									=> array( 'Hisense', 'EG968B' ),
+			'HKPHONE H8-3G'								=> array( 'HKPhone', 'H8 3G' ),
+			'D7800AD'									=> array( 'Honeywell', 'D7800AD' ),
+			'HOSIN U2'									=> array( 'Hosin', 'U2' ),
+			'(HP )?Touchpad!'							=> array( 'HP', 'TouchPad', TYPE_TABLET ),
+			'(cm|aokp) tenderloin!'						=> array( 'HP', 'TouchPad', TYPE_TABLET ),
+			'Amaze 4G'									=> array( 'HTC', 'Amaze 4G' ),
+			'HTC (Amaze|Ruby)!'							=> array( 'HTC', 'Amaze 4G' ),
+			'HTC (Aria|Liberty)!'						=> array( 'HTC', 'Aria' ),
+			'HTC A63(66|80)!'							=> array( 'HTC', 'Aria' ),
+			'HTC Bee'									=> array( 'HTC', 'Bee' ),
+			'HTC ChaCha!'								=> array( 'HTC', 'ChaCha' ),
+			'HTC A810e'									=> array( 'HTC', 'ChaCha' ),
+			'HTC A9188!'								=> array( 'HTC', 'Cullinan' ),
+			'HTC Desire C'								=> array( 'HTC', 'Desire C' ),
+			'HTC Desire ?HD!'							=> array( 'HTC', 'Desire HD' ),
+			'HTC A91(91|92)!'							=> array( 'HTC', 'Desire HD' ),
+			'HTC ?Desire ?S( |$)!'						=> array( 'HTC', 'Desire S' ),
+			'HTC S510(b|e)!'							=> array( 'HTC', 'Desire S' ),
+			'HTC Desire Saga'							=> array( 'HTC', 'Desire S' ),
+			'HTC Saga'									=> array( 'HTC', 'Desire S' ),
+			'HTC Desire V'								=> array( 'HTC', 'Desire V' ),
+			'HTC T328w'									=> array( 'HTC', 'Desire V' ),
+			'HTC Desire VC'								=> array( 'HTC', 'Desire VC' ),
+			'HTC T328d'									=> array( 'HTC', 'Desire VC' ),
+			'HTC Desire VT'								=> array( 'HTC', 'Desire VT' ),
+			'HTC T328t'									=> array( 'HTC', 'Desire VT' ),
+			'HTC Desire ?Z!'							=> array( 'HTC', 'Desire Z' ),
+			'HTC Vision'								=> array( 'HTC', 'Desire Z' ),
+			'HTC A72(71|72|75)!'						=> array( 'HTC', 'Desire Z' ),
+			'HTC Desire!'								=> array( 'HTC', 'Desire' ),
+			'HTC Bravo'									=> array( 'HTC', 'Desire' ),
+			'HTC A81(81|83)!'							=> array( 'HTC', 'Desire' ),
+			'HTC ?X06HT!'								=> array( 'HTC', 'Desire' ),
+			'HTC Dream'									=> array( 'HTC', 'Dream' ),
+			'HTC Droid Incredible'						=> array( 'HTC', 'Droid Incredible' ),
+			'HTC S710d'									=> array( 'HTC', 'Droid Incredible 2' ),
+			'HTC Incredible 2'							=> array( 'HTC', 'Droid Incredible 2' ),
+			'HTC EVO ?3D!'								=> array( 'HTC', 'EVO 3D' ),
+			'HTC X51(5a|5c|5d|5m)!'						=> array( 'HTC', 'EVO 3D' ),
+			'HTC EVO 4G\+!'								=> array( 'HTC', 'EVO 4G+' ),
+			'HTC X515e'									=> array( 'HTC', 'EVO 4G+' ),
+			'HTC ?EVO ?4G!'								=> array( 'HTC', 'EVO 4G' ),
+			'HTC jewel'									=> array( 'HTC', 'EVO 4G' ),
+			'HTC ?(EVO ?)?Design ?4G!'					=> array( 'HTC', 'EVO Design 4G' ),		
+			'HTC C715c'									=> array( 'HTC', 'EVO Design 4G' ),
+			'HTC EVO Shift!'							=> array( 'HTC', 'EVO Shift' ),
+			'HTC Explorer!'								=> array( 'HTC', 'Explorer' ),
+			'HTC A31(0b|0e)!'							=> array( 'HTC', 'Explorer' ),
+			'HTC Flyer!'								=> array( 'HTC', 'Flyer', TYPE_TABLET ),
+			'HTC P51(0e|2|5e)!'							=> array( 'HTC', 'Flyer', TYPE_TABLET ),
+			'HTC Gratia!'								=> array( 'HTC', 'Gratia' ),
+			'HTC A6380'									=> array( 'HTC', 'Gratia' ),
+			'HTC HD'									=> array( 'HTC', 'HD' ),
+			'HTC HD2!'									=> array( 'HTC', 'HD2' ),
+			'HTC T8585'									=> array( 'HTC', 'HD2' ),
+			'HTC HD7!'									=> array( 'HTC', 'HD7' ),
+			'HTC T92(98|99)!'							=> array( 'HTC', 'HD7' ),
+			'HTC HD7S!'									=> array( 'HTC', 'HD7s' ),
+			'HTC T(93|98)99!'							=> array( 'HTC', 'HD7s' ),
+			'VitMod ExtraLite 1.6.5.fullodex for HTC HD7 Pro'		=> array( 'HTC', 'HD7 Pro' ),
+			'HTC HERO200'								=> array( 'HTC', 'Hero 200' ),			/* Sprint */
+			'HTC Hero S'								=> array( 'HTC', 'Hero S' ),				/* US Cellular */
+			'HTC Hero!'									=> array( 'HTC', 'Hero' ),
+			'HTC H3000C'								=> array( 'HTC', 'Hero' ),
+			'HTC IMAGIO'								=> array( 'HTC', 'Imagio' ),
+			'HTC Incredible'							=> array( 'HTC', 'Incredible' ),
+			'HTC Incredible ?S!'						=> array( 'HTC', 'Incredible S' ),
+			'HTC Vivo'									=> array( 'HTC', 'Incredible S' ),
+			'HTC S710e!'								=> array( 'HTC', 'Incredible S' ),
+			'HTC Innovation'							=> array( 'HTC', 'Innovation' ),
+			'HTC (HD7 )?Inspire!'						=> array( 'HTC', 'Inspire 4G' ),
+			'HTC J Z321e'								=> array( 'HTC', 'J' ),
+			'HTC X920e'									=> array( 'HTC', 'J Butterfly' ),
+			'HTC Butterfly'								=> array( 'HTC', 'J Butterfly' ),
+			'HTC P715a'									=> array( 'HTC', 'Jetstream', TYPE_TABLET ),
+			'HTC Legend'								=> array( 'HTC', 'Legend' ),
+			'HTC Magic!'								=> array( 'HTC', 'Magic' ),
+			'HTC Sapphire'								=> array( 'HTC', 'Magic' ),
+			'HTC Lexikon'								=> array( 'HTC', 'Merge' ),
+			'HTC One S'									=> array( 'HTC', 'One S' ),
+			'HTC One S !'								=> array( 'HTC', 'One S' ),
+			'HTC Z(52|56)0e!'							=> array( 'HTC', 'One S' ),
+			'HTC T528d'									=> array( 'HTC', 'One SC' ),
+			'HTC T528w'									=> array( 'HTC', 'One SU' ),
+			'HTC One SV'								=> array( 'HTC', 'One SV' ),
+			'HTC One V'									=> array( 'HTC', 'One V' ),
+			'HTC T320e'									=> array( 'HTC', 'One V' ),
+			'HTC H2000C'								=> array( 'HTC', 'One V' ),
+			'HTC One VX'								=> array( 'HTC', 'One VX' ),
+			'HTC One X'									=> array( 'HTC', 'One X' ),
+			'HTC Endeavour!'							=> array( 'HTC', 'One X' ),
+			'HTC S720e'									=> array( 'HTC', 'One X' ),
+			'HTC One X+'								=> array( 'HTC', 'One X+' ),
+			'HTC OneXplus'								=> array( 'HTC', 'One X+' ),
+			'HTC PM63100'								=> array( 'HTC', 'One X+' ),
+			'HTC One XL'								=> array( 'HTC', 'One XL' ),
+			'HTC S720t'									=> array( 'HTC', 'One XT' ),
+			'HTC Raider!'								=> array( 'HTC', 'Raider 4G' ),
+			'HTC Holiday'								=> array( 'HTC', 'Raider 4G' ),
+			'HTC X710(a|e|s)!'							=> array( 'HTC', 'Raider 4G' ),
+			'HTC PH39100'								=> array( 'HTC', 'Raider 4G' ),
+			'HTC Rezound'								=> array( 'HTC', 'Rezound' ),
+			'HTC Rhyme!'								=> array( 'HTC', 'Rhyme' ),
+			'HTC Bliss!'								=> array( 'HTC', 'Rhyme' ),
+			'HTC S510b'									=> array( 'HTC', 'Rhyme' ),
+			'HTC Salsa!'								=> array( 'HTC', 'Salsa' ),	
+			'HTC C510e'									=> array( 'HTC', 'Salsa' ),
+			'HTC Sensation.*XE!'						=> array( 'HTC', 'Sensation XE' ),
+			'HTC .*Z715(a|e)!'							=> array( 'HTC', 'Sensation XE' ),
+			'HTC Sensation.*XL!'						=> array( 'HTC', 'Sensation XL' ),
+			'HTC Runnymede'								=> array( 'HTC', 'Sensation XL' ),
+			'HTC .*X315(b|e)!'							=> array( 'HTC', 'Sensation XL' ),
+			'HTC G21!'									=> array( 'HTC', 'Sensation XL' ),
+			'HTC ?Sensation!'							=> array( 'HTC', 'Sensation' ),
+			'HTC Pyramid!'								=> array( 'HTC', 'Sensation' ),
+			'HTC .*Z710(a|e|t)?!'						=> array( 'HTC', 'Sensation' ),
+			'HTC G14!'									=> array( 'HTC', 'Sensation' ),
+			'HTC Status'								=> array( 'HTC', 'Status' ),
+			'HTC PH06130'								=> array( 'HTC', 'Status' ),
+			'HTC Tattoo!'								=> array( 'HTC', 'Tattoo' ),
+			'HTC Click'									=> array( 'HTC', 'Tattoo' ),
+			'HTC A3288'									=> array( 'HTC', 'Tattoo' ),
+			'HTC A9188'									=> array( 'HTC', 'Tianxi' ),
+			'HTC X310e'									=> array( 'HTC', 'Titan' ),
+			'HTC DiamondII EX'							=> array( 'HTC', 'Touch Diamond II' ),
+			'HTC T7373'									=> array( 'HTC', 'Touch Pro II' ),
+			'HTC ThunderBolt( 4G)?!'					=> array( 'HTC', 'ThunderBolt'),	
+			'HTC Mecha'									=> array( 'HTC', 'ThunderBolt'),
+			'HTC Velocity!'								=> array( 'HTC', 'Velocity 4G'),
+			'HTC ?Wildfire ?S!'							=> array( 'HTC', 'Wildfire S' ),	
+			'HTC .*A510(a|b|c|e)!'						=> array( 'HTC', 'Wildfire S' ),
+			'HTC Wildfire!'								=> array( 'HTC', 'Wildfire' ),
+			'HTC .*A33(33|66|80)!'						=> array( 'HTC', 'Wildfire' ),
+			'HTC A6390'									=> array( 'HTC', 'A6390' ),
+			'HTC A8180'									=> array( 'HTC', 'A8180' ),
+			'HTC PG762'									=> array( 'HTC', 'PG762' ),
+			'HTC S610d'									=> array( 'HTC', 'S610d' ),
+			'HTC S715e'									=> array( 'HTC', 'S715e' ),
+			'HTC T329t'									=> array( 'HTC', 'T329t' ),
+			'HTC Z510d'									=> array( 'HTC', 'Z510d' ),
+			'HTC VLE U'									=> array( 'HTC', 'One S' ),
+			'HTC VLE#U'									=> array( 'HTC', 'One S' ),
+			'HTC VIE U'									=> array( 'HTC', 'One S' ),
+			'HTC EVA UL'								=> array( 'HTC', 'One V' ),
+			'HTC DLX U'									=> array( 'HTC', 'Droid DNA' ),
+			'HTC DLX WL'								=> array( 'HTC', 'Droid DNA' ),
+			'HTC6435LVW!'								=> array( 'HTC', 'Droid DNA' ),
+			'DLX'										=> array( 'HTC', 'Droid DNA' ),
+			'HTC ENR U'									=> array( 'HTC', 'One X' ),
+			'ENR U'										=> array( 'HTC', 'One X' ),
+			'EndeavorU'									=> array( 'HTC', 'One X' ),
+			'HTC EVARE UL'								=> array( 'HTC', 'One X+' ),
+			'HTCOne XL'									=> array( 'HTC', 'One XL' ),
+			'Liberty'									=> array( 'HTC', 'Aria' ),
+			'Desire HD!'								=> array( 'HTC', 'Desire HD' ),
+			'Desire ?S!'								=> array( 'HTC', 'Desire S' ),
+			'Desire Z'									=> array( 'HTC', 'Desire Z' ),
+			'Desire!'									=> array( 'HTC', 'Desire' ),
+			'Dream'										=> array( 'HTC', 'Dream' ),
+			'GinDream/GinMagic'							=> array( 'HTC', 'Dream' ),
+			'SiRF Dream'								=> array( 'HTC', 'Dream' ),
+			'Droid Incredible'							=> array( 'HTC', 'Droid Incredible' ),
+			'Incredible'								=> array( 'HTC', 'Droid Incredible' ),	/* Verizon */
+			'Incredible 2'								=> array( 'HTC', 'Droid Incredible 2' ),	/* Verizon */
+			'EVO'										=> array( 'HTC', 'EVO' ),
+			'Evo HD2'									=> array( 'HTC', 'EVO HD' ),
+			'EVO ?3D!'									=> array( 'HTC', 'EVO 3D' ),
+			'EVO 4G'									=> array( 'HTC', 'EVO 4G' ),
+			'photon'									=> array( 'HTC', 'HD mini' ),
+			'HD2'										=> array( 'HTC', 'HD2' ),
+			'NexusHD2'									=> array( 'HTC', 'HD2' ),
+			'Nexus HD2'									=> array( 'HTC', 'HD2' ),
+			'HD7  Pro'									=> array( 'HTC', 'HD7 Pro' ),
+			'Hero'										=> array( 'HTC', 'Hero' ),
+			'HERO CDMA'									=> array( 'HTC', 'Hero' ),
+			'HERO200'									=> array( 'HTC', 'Hero 200' ),
+			'Incredible ?S!'							=> array( 'HTC', 'Incredible S' ),
+			'Incredible ?2!'							=> array( 'HTC', 'Incredible 2' ),
+			'Inspire HD'								=> array( 'HTC', 'Inspire 4G' ),
+			'Inspire 4G'								=> array( 'HTC', 'Inspire 4G' ),
+			'Legend'									=> array( 'HTC', 'Legend' ),
+			'Docomo HT-03A'								=> array( 'HTC', 'Magic' ),
+			'One X'										=> array( 'HTC', 'One X' ),
+			'One V'										=> array( 'HTC', 'One V' ),
+			'Rezound'									=> array( 'HTC', 'Rezound' ),
+			'MIUI.us Sensation 4G'						=> array( 'HTC', 'Sensation 4G' ),
+			'SensationXE!'								=> array( 'HTC', 'Sensation XE' ),
+			'SensationXL!'								=> array( 'HTC', 'Sensation XL' ),
+			'Sensation!'								=> array( 'HTC', 'Sensation' ),
+			'Pyramid'									=> array( 'HTC', 'Sensation' ),
+			'TripNiCE Pyramid'							=> array( 'HTC', 'Sensation' ),
+			'Click'										=> array( 'HTC', 'Tattoo' ),
+			'Wildfire S!'								=> array( 'HTC', 'Wildfire S' ),
+			'Wildfire!'									=> array( 'HTC', 'Wildfire' ),
+			'Sprint APX515CKT'							=> array( 'HTC', 'EVO 3D' ),
+			'Sprint APA9292KT'							=> array( 'HTC', 'EVO 4G' ),
+			'Sprint APA7373KT'							=> array( 'HTC', 'EVO Shift 4G' ),
+			'Sprint APC715CKT'							=> array( 'HTC', 'EVO Design 4G' ),
+			'A3380'										=> array( 'HTC', 'Wildfire' ),
+			'A6277'										=> array( 'HTC', 'Hero' ),
+			'a7272'										=> array( 'HTC', 'Desire Z' ),					
+			'A7272+(HTC DesireZ)'						=> array( 'HTC', 'Desire Z' ),					
+			'S31HT'										=> array( 'HTC', 'Aria' ),
+			'S710d'										=> array( 'HTC', 'Droid Incredible 2' ),
+			'S710D'										=> array( 'HTC', 'Droid Incredible 2' ),
+			'X06HT'										=> array( 'HTC', 'Desire' ),
+			'001HT'										=> array( 'HTC', 'Desire HD' ),
+			'X325a'										=> array( 'HTC', 'One X' ),
+			'X525a'										=> array( 'HTC', 'One X+' ),
+			'Z520m'										=> array( 'HTC', 'One S' ),
+			'Z710'										=> array( 'HTC', 'Sensation' ),
+			'Z710e'										=> array( 'HTC', 'Sensation' ),
+			'T9199h'									=> array( 'HTC', 'T9199h' ),
+			'ADR6200'									=> array( 'HTC', 'Droid Eris' ),
+			'ADR6300'									=> array( 'HTC', 'Droid Incredible' ),
+			'ADR6325!'									=> array( 'HTC', 'Merge' ),
+			'ADR6330VW'									=> array( 'HTC', 'Rhyme' ),	
+			'ADR6350'									=> array( 'HTC', 'Droid Incredible 2' ),
+			'ADR6400L!'									=> array( 'HTC', 'Thunderbolt 4G' ),
+			'ADR6410LVW!'								=> array( 'HTC', 'Fireball' ),
+			'ADR6425LVW!'								=> array( 'HTC', 'Rezound' ),
+			'Coquettish Red'							=> array( 'HTC', 'Rezound' ),
+			'PB99400'									=> array( 'HTC', 'Desire' ),	
+			'pcdadr6350'								=> array( 'HTC', 'Droid Incredible 2' ),
+			'PC36100'									=> array( 'HTC', 'EVO 4G' ),
+			'PG06100'									=> array( 'HTC', 'EVO Shift 4G' ),
+			'PG41200'									=> array( 'HTC', 'EVO View 4G', TYPE_TABLET ),
+			'PG86100!'									=> array( 'HTC', 'EVO 3D' ),
+			'PH44100'									=> array( 'HTC', 'EVO Design 4G' ),
+			'PJ83100'									=> array( 'HTC', 'One X' ),
+			'PM36100'									=> array( 'HTC', 'One VX' ),
+			'PM63100'									=> array( 'HTC', 'One X+' ),
+			'ISW11HT'									=> array( 'HTC', 'EVO 4G' ),
+			'ISW12HT'									=> array( 'HTC', 'EVO 3D' ),
+			'ISW13HT'									=> array( 'HTC', 'J' ),
+			'HTL21'										=> array( 'HTC', 'J Butterfly' ),
+			'USCCADR6275US!'							=> array( 'HTC', 'Desire' ),
+			'USCCADR6285US!'							=> array( 'HTC', 'Hero S' ),
+			'USCCADR6325US!'							=> array( 'HTC', 'Merge' ),
+			'MediaPad'									=> array( 'Huawei', 'MediaPad', TYPE_TABLET ),
+			'Huawei MediaPad'							=> array( 'Huawei', 'MediaPad', TYPE_TABLET ),
+			'Huawei S7-312u'							=> array( 'Huawei', 'MediaPad', TYPE_TABLET ),
+			'MediaPad 7 Lite'							=> array( 'Huawei', 'MediaPad 7 Lite', TYPE_TABLET ),
+			'MediaPad 10 FHD'							=> array( 'Huawei', 'MediaPad 10', TYPE_TABLET ),
+			'Huawei C8500!'								=> array( 'Huawei', 'C8500' ),
+			'Huawei C8600'								=> array( 'Huawei', 'C8600' ),
+			'Huawei C8650!'								=> array( 'Huawei', 'C8650' ),
+			'Huawei C8800'								=> array( 'Huawei', 'IDEOS X5' ),
+			'Huawei C8810'								=> array( 'Huawei', 'Ascend G300' ),
+			'Huawei C8812!'								=> array( 'Huawei', 'Ascend C8812' ),
+			'Huawei C8825D'								=> array( 'Huawei', 'Ascend G330C' ),
+			'Huawei C8860E'								=> array( 'Huawei', 'Honor' ),
+			'Huawei C8950D'								=> array( 'Huawei', 'Honor+' ),
+			'Huawei G300'								=> array( 'Huawei', 'Ascend G300' ),
+			'Huawei M835'								=> array( 'Huawei', 'M835' ),
+			'Huawei M860'								=> array( 'Huawei', 'Ascend' ),
+			'Huawei M920'								=> array( 'Huawei', 'M920' ),
+			'Huawei M921'								=> array( 'Huawei', 'M921' ),
+			'Huawei M931'								=> array( 'Huawei', 'M931' ),
+			'Huawei S8520'								=> array( 'Huawei', 'S8520' ),
+			'Huawei S8600'								=> array( 'Huawei', 'S8600' ),
+			'Huawei T8100'								=> array( 'Huawei', 'T8100' ),
+			'Huawei T8300'								=> array( 'Huawei', 'T8300' ),
+			'Huawei ?T8500!'							=> array( 'Huawei', 'T8500' ),
+			'Huawei T8600'								=> array( 'Huawei', 'T8600' ),
+			'Huawei T8620'								=> array( 'Huawei', 'Ascend Y200T' ),
+			'Huawei T8828'								=> array( 'Huawei', 'Ascend G305T' ),
+			'Huawei T8830'								=> array( 'Huawei', 'Ascend G309T' ),
+			'Huawei T8950'								=> array( 'Huawei', 'Honor+' ),
+			'Huawei T9200'								=> array( 'Huawei', 'Ascend P1' ),
+			'Huawei U8220'								=> array( 'Huawei', 'U8220' ),
+			'Huawei U8500'								=> array( 'Huawei', 'IDEOS X2' ),
+			'Huawei ?U8520!'							=> array( 'Huawei', 'U8520 Duplex' ),
+			'Huawei ?U8650!'							=> array( 'Huawei', 'Sonic' ),
+			'Huawei U8652'								=> array( 'Huawei', 'Sonic' ),
+			'Huawei U8661'								=> array( 'Huawei', 'Sonic+' ),
+			'Huawei U8665'								=> array( 'Huawei', 'Fusion 2' ),
+			'Huawei U8666!'								=> array( 'Huawei', 'Ascend Y201' ),
+			'Huawei U8681'								=> array( 'Huawei', 'Ascend G312' ),
+			'Huawei U8800!'								=> array( 'Huawei', 'IDEOS X5' ),
+			'Huawei U8815!'								=> array( 'Huawei', 'Ascend G300' ),
+			'Huawei U8818'								=> array( 'Huawei', 'Ascend G300' ),
+			'Huawei U8825D'								=> array( 'Huawei', 'Ascend G330D' ),
+			'Huawei U8825-1'							=> array( 'Huawei', 'Ascend G330' ),
+			'Huawei U8850'								=> array( 'Huawei', 'Vision' ),
+			'Huawei U8860'								=> array( 'Huawei', 'Honor' ),
+			'Huawei U8950!'								=> array( 'Huawei', 'Ascend G600' ),
+			'Huawei ?U9000'								=> array( 'Huawei', 'Ascend X' ),
+			'Huawei U9508'								=> array( 'Huawei', 'Honor 2' ),
+			'Huawei U9510!'								=> array( 'Huawei', 'Ascend D quad' ),
+			'Huawei D2-0082'							=> array( 'Huawei', 'Ascend D2' ),
+			'Huawei IDEOS U8500'						=> array( 'Huawei', 'IDEOS X2' ),
+			'Huawei IDEOS U8650'						=> array( 'Huawei', 'Sonic' ),
+			'Huawei IDEOS X3'							=> array( 'Huawei', 'IDEOS X3' ),
+			'Huawei Ideos X5!'							=> array( 'Huawei', 'IDEOS X5' ),
+			'Huawei SONIC'								=> array( 'Huawei', 'Sonic' ),
+			'Huawei 8100-9'								=> array( 'Huawei', 'U8100' ),
+			'Ascend G300'								=> array( 'Huawei', 'Ascend G300' ),
+			'Huawei Y300!'								=> array( 'Huawei', 'Ascend Y300' ),
+			'Huawei Ascend X'							=> array( 'Huawei', 'Ascend X' ),
+			'FUSIONideos'								=> array( 'Huawei', 'IDEOS' ),
+			'Gnappo Ideos'								=> array( 'Huawei', 'IDEOS' ),
+			'Ideos'										=> array( 'Huawei', 'IDEOS' ),
+			'IDEOS X5'									=> array( 'Huawei', 'IDEOS X5' ),
+			'IDEOS S7!'									=> array( 'Huawei', 'IDEOS S7', TYPE_TABLET ),
+			'Huawei S7'									=> array( 'Huawei', 'IDEOS S7', TYPE_TABLET ),
+			'SONIC'										=> array( 'Huawei', 'Sonic' ),
+			'Kyivstar Aqua'								=> array( 'Huawei', 'Sonic' ),
+			'Lucky Ultra Sonic U8650'					=> array( 'Huawei', 'Sonic' ),
+			'MTC Android'								=> array( 'Huawei', 'U8110' ),
+			'S31HW'										=> array( 'Huawei', 'Pocket WiFi S' ),
+			'S41HW'										=> array( 'Huawei', 'Pocket WiFi S II' ),
+			'007HW'										=> array( 'Huawei', 'Vision' ),	
+			'201HW'										=> array( 'Huawei', 'Ascend P1' ),
+			'UM840'										=> array( 'Huawei', 'Evolution' ),	
+			'M860'										=> array( 'Huawei', 'Ascend' ),
+			'M865'										=> array( 'Huawei', 'Ascend II' ),
+			'M886'										=> array( 'Huawei', 'Glory' ),
+			'C8150'										=> array( 'Huawei', 'IDEOS' ),
+			'C8500!'									=> array( 'Huawei', 'C8500' ),
+			'C8600'										=> array( 'Huawei', 'C8600' ),
+			'C8650'										=> array( 'Huawei', 'C8650' ),
+			'C8800'										=> array( 'Huawei', 'C8800' ),
+			'C8810'										=> array( 'Huawei', 'Ascend G300C' ),
+			'C8812'										=> array( 'Huawei', 'Ascend C8812' ),
+			'S8600'										=> array( 'Huawei', 'S8600' ),
+			'T8620'										=> array( 'Huawei', 'Ascend Y200T' ),
+			'T8808!'									=> array( 'Huawei', 'Ascend G306T' ),
+			'T8830!'									=> array( 'Huawei', 'Ascend G309T' ),
+			'T9200'										=> array( 'Huawei', 'Ascend P1' ),
+			'U8100'										=> array( 'Huawei', 'U8100' ),
+			'U8110'										=> array( 'Huawei', 'U8110' ),
+			'U8120'										=> array( 'Huawei', 'U8120' ),
+			'U8180'										=> array( 'Huawei', 'IDEOS X1' ),
+			'U8220'										=> array( 'Huawei', 'Pulse' ),
+			'U8300'										=> array( 'Huawei', 'U8300' ),
+			'U8350'										=> array( 'Huawei', 'Boulder' ),
+			'U8150'										=> array( 'Huawei', 'IDEOS' ),
+			'U8160'										=> array( 'Huawei', 'U8160' ),
+			'U8180'										=> array( 'Huawei', 'IDEOS X1' ),
+			'U8185'										=> array( 'Huawei', 'Ascend Y100' ),
+			'U8500'										=> array( 'Huawei', 'IDEOS X2' ),
+			'U8500 HiQQ'								=> array( 'Huawei', 'U8500 HiQQ Edition' ),
+			'U8510'										=> array( 'Huawei', 'IDEOS X3' ),
+			'U8600'										=> array( 'Huawei', 'U8600' ),
+			'U8650!'									=> array( 'Huawei', 'Sonic' ),
+			'U8655!'									=> array( 'Huawei', 'Ascend Y200' ),
+			'U8660'										=> array( 'Huawei', 'Sonic' ),
+			'U8800 ?Pro!'								=> array( 'Huawei', 'IDEOS X5 Pro' ),
+			'U8800!'									=> array( 'Huawei', 'IDEOS X5' ),
+			'U8812D'									=> array( 'Huawei', 'Ascend G302D' ),
+			'U8815'										=> array( 'Huawei', 'Ascend G300' ),
+			'U8818'										=> array( 'Huawei', 'Ascend G300' ),
+			'U8820'										=> array( 'Huawei', 'Titan' ),
+			'U8836D'									=> array( 'Huawei', 'Ascend G500' ),
+			'U8850'										=> array( 'Huawei', 'Vision' ),
+			'U8860!'									=> array( 'Huawei', 'Honor' ),
+			'U9000'										=> array( 'Huawei', 'Ascend X' ),
+			'U9200!'									=> array( 'Huawei', 'Ascend P1' ),
+			'U9202!'									=> array( 'Huawei', 'Ascend P1' ),
+			'U9500'										=> array( 'Huawei', 'Ascend D1' ),
+			'U9501L'									=> array( 'Huawei', 'Ascend D LTE' ),
+			'U9510!'									=> array( 'Huawei', 'Ascend D quad' ),
+			'Comet'										=> array( 'Huawei', 'Comet' ),
+			'GS02'										=> array( 'Huawei', 'Honor' ),
+			'GS03'										=> array( 'Huawei', 'Ascend P1' ),
+			'DroniX-0.5'								=> array( 'Huawei', 'U8180' ),
+			'MTS-SP101'									=> array( 'Huawei', 'C8511' ),
+			'TSP21'										=> array( 'Huawei', 'U8110' ),
+			'HW-01E'									=> array( 'Huawei', 'Ascend HW-01E' ),								
+			'HYUNDAI H6'								=> array( 'Hyundai', 'Storm H6' ),
+			'MW1031'									=> array( 'Hyundai', 'MW1031', TYPE_TABLET ),
+			'iBall i6012'								=> array( 'iBall', 'Slide i6012', TYPE_TABLET ),
+			'iBall Slide i7011'							=> array( 'iBall', 'Slide i7011', TYPE_TABLET ),
+			'iBall Slide 3G 7334'						=> array( 'iBall', 'Slide 3G 7334', TYPE_TABLET ),
+			'NetTAB RUNE'								=> array( 'IconBit', 'NetTab Rune', TYPE_TABLET ),
+			'NetTAB THOR-LE'							=> array( 'IconBit', 'NetTab Thor LE', TYPE_TABLET ),
+			'D70W'										=> array( 'Icoo', 'D70W', TYPE_TABLET ),
+			'D80'										=> array( 'Icoo', 'D80', TYPE_TABLET ),
+			'INFOBAR A01'								=> array( 'iida', 'INFOBAR A01' ),
+			'IMO S88'									=> array( 'IMO', 'Discovery S88' ),
+			'IMO S89'									=> array( 'IMO', 'Miracle S89' ),
+			'M009F'										=> array( 'Infotmic', 'M009F' ),
+			'AZ210A'									=> array( 'Intel', 'AZ210A' ),
+			'AZ210B'									=> array( 'Intel', 'AZ210B' ),
+			'AZ510'										=> array( 'Intel', 'AZ510' ),
+			'BT210'										=> array( 'Intel', 'BT210' ),
+			'BT510'										=> array( 'Intel', 'BT510' ),
+			'greenridge'								=> array( 'Intel', 'Green Ridge', TYPE_TABLET ),
+			'INQ Cloud Touch'							=> array( 'INQ', 'Cloud Touch' ),
+			'NS-13T001'									=> array( 'Insignia', 'Flex Tablet', TYPE_TABLET ),
+			'ILT-MX100'									=> array( 'iRiver', 'Tab', TYPE_TABLET ),
+			'IVIO_DE38'									=> array( 'Ivio', 'DE38' ),
+			'JY-G2'										=> array( 'Jiayu', 'G2' ),
+			'JY-G2L'									=> array( 'Jiayu', 'G2' ),
+			'JY-G3'										=> array( 'Jiayu', 'G3' ),
+			'JT-Smart PC01'								=> array( 'Joy-IT', 'JT-Smart PC-01' ),
+			'JXD S601WIFI'								=> array( 'JXD', 'S601 WIFI', 'media' ),
+			'A2'										=> array( 'KakaTech', 'A2' ),
+			'Karbonn A21'								=> array( 'Karbonn', 'A21' ),
+			'ST10'										=> array( 'Karbonn', 'Smart Tab 10 Cosmic', TYPE_TABLET ),
+			'D91'										=> array( 'KK', 'D91', TYPE_TABLET ),
+			'K080'										=> array( 'Kobo', 'K080', TYPE_EREADER ),
+			'W990'										=> array( 'Konka', 'W990' ),
+			'A106'										=> array( 'koobee', 'A160' ),
+			'KPT A9'									=> array( 'KPT', 'A9' ),
+			'EV-S100'									=> array( 'Kttech', 'Take EV-S100' ),
+			'KM-E100'									=> array( 'Kttech', 'Take LTE KM-E100' ),
+			'KM-S120'									=> array( 'Kttech', 'Take 2 KM-S120' ),
+			'KM-S200'									=> array( 'Kttech', 'Take Janus KM-S200' ),
+			'KM-S220'									=> array( 'Kttech', 'Take Tachy KM-S220' ),
+			'Kyobo mirasol eReader'						=> array( 'Kyobo', 'eReader', TYPE_EREADER ),
+			'ISW11K'									=> array( 'Kyocera', 'Digno' ),
+			'KYL21'										=> array( 'Kyocera', 'Digno S' ),
+			'JC-KSP8000'								=> array( 'Kyocera', 'Echo' ),
+			'KSP8000'									=> array( 'Kyocera', 'Echo' ),
+			'Zio'										=> array( 'Kyocera', 'Zio' ),
+			'C5155'										=> array( 'Kyocera', 'C5155' ),
+			'C5170'										=> array( 'Kyocera', 'C5170' ),
+			'M9300'										=> array( 'Kyocera', 'M9300' ),
+			'K-Touch E619'								=> array( 'K-Touch', 'E619' ),
+			'E800'										=> array( 'K-Touch', 'E800' ),
+			'K-TouchT580'								=> array( 'K-Touch', 'T580' ),
+			'K-Touch T619'								=> array( 'K-Touch', 'T619' ),
+			'K-Touch U6'								=> array( 'K-Touch', 'U6' ),
+			'K-Touch U10'								=> array( 'K-Touch', 'U10' ),
+			'K-Touch V8'								=> array( 'K-Touch', 'V8' ),
+			'K-Touch V9'								=> array( 'K-Touch', 'V9' ),
+			'W606'										=> array( 'K-Touch', 'W606' ),
+			'K-Touch W619'								=> array( 'K-Touch', 'W619' ),
+			'K-Touch W621'								=> array( 'K-Touch', 'W621' ),
+			'K-Touch W650'								=> array( 'K-Touch', 'W650' ),
+			'K-Touch W658'								=> array( 'K-Touch', 'W658' ),
+			'K-Touch W688'								=> array( 'K-Touch', 'W688' ),
+			'W700'										=> array( 'K-Touch', 'W700' ),
+			'K-Touch W719'								=> array( 'K-Touch', 'W719' ),
+			'W732'										=> array( 'K-Touch', 'W732' ),
+			'K-Touch W760'								=> array( 'K-Touch', 'W760' ),
+			'W800'										=> array( 'K-Touch', 'W800' ),
+			'K-Touch W806!'								=> array( 'K-Touch', 'W806' ),
+			'W806'										=> array( 'K-Touch', 'W806' ),
+			'W808'										=> array( 'K-Touch', 'W808' ),
+			'W810'										=> array( 'K-Touch', 'W810' ),
+			'W880'										=> array( 'K-Touch', 'W880' ),
+			'XOLO A700'									=> array( 'Lava', 'XOLO A700' ),
+			'XOLO A800'									=> array( 'Lava', 'XOLO A800' ),
+			'Xolo X500'									=> array( 'Lava', 'XOLO X500' ),
+			'X900'										=> array( 'Lava', 'XOLO X900' ),
+			'Xolo X900'									=> array( 'Lava', 'XOLO X900' ),
+			'LENCM900HZ'								=> array( 'Lenco', 'TAB 811', TYPE_TABLET ),
+			'ThinkPad( Tablet)?!'						=> array( 'Lenovo', 'ThinkPad Tablet', TYPE_TABLET ),
+			'(Ideapad )?K1!'							=> array( 'Lenovo', 'IdeaPad K1', TYPE_TABLET ),
+			'Ideapad S10-3T'							=> array( 'Lenovo', 'IdeaPad S10-3T', TYPE_TABLET ),
+			'S2005A-H'									=> array( 'Lenovo', 'S2005A' ),
+			'IdeaTab ?A2107(A-F|A-H)!'					=> array( 'Lenovo', 'IdeaTab A2107A', TYPE_TABLET ),
+			'IdeaTab ?A2109(A)!'						=> array( 'Lenovo', 'IdeaTab A2109A', TYPE_TABLET ),
+			'IdeaTab ?A2207(A-H)!'						=> array( 'Lenovo', 'IdeaTab A2207A', TYPE_TABLET ),
+			'IdeaTab ?K2110(A-F)!'						=> array( 'Lenovo', 'IdeaTab K2110A', TYPE_TABLET ),
+			'IdeaTab ?S2007(A-D)!'						=> array( 'Lenovo', 'IdeaTab S2007A', TYPE_TABLET ),
+			'IdeaTab ?S2109(A-F)!'						=> array( 'Lenovo', 'IdeaTab S2109A', TYPE_TABLET ),
+			'IdeaTab ?V2007(A|A-D-I)!'					=> array( 'Lenovo', 'IdeaTab V2007A', TYPE_TABLET ),
+			'IdeaTab ?V2010(A)!'						=> array( 'Lenovo', 'IdeaTab V2010A', TYPE_TABLET ),
+			'A1 07'										=> array( 'Lenovo', 'LePad', TYPE_TABLET ),
+			'lepad 001b'								=> array( 'Lenovo', 'LePad', TYPE_TABLET ),
+			'lepad 001n'								=> array( 'Lenovo', 'LePad', TYPE_TABLET ),
+			'(Lenovo )?3GC101!'							=> array( 'Lenovo', 'LePhone 3GC101' ),
+			'(Lenovo |Lephone )?3GW100!'				=> array( 'Lenovo', 'LePhone 3GW100' ),
+			'(Lenovo |Lephone )?3GW101!'				=> array( 'Lenovo', 'LePhone 3GW101' ),
+			'Lenovo A1-32AB0'							=> array( 'Lenovo', 'LePhone A1-32AB0' ),
+			'Lenovo S1-37AH0'							=> array( 'Lenovo', 'LePhone S1-37AH0' ),
+			'S1 37AHO'									=> array( 'Lenovo', 'LePhone S1-37AH0' ),
+			'Lenovo S2-38AH0'							=> array( 'Lenovo', 'LePhone S2-38AH0' ),
+			'Lenovo S2-38AT0'							=> array( 'Lenovo', 'LePhone S2-38AT0' ),
+			'Lenovo A288t'								=> array( 'Lenovo', 'LePhone A288' ),
+			'Lenovo A300'								=> array( 'Lenovo', 'LePhone A300' ),
+			'Lenovo A326'								=> array( 'Lenovo', 'LePhone A326' ),
+			'Lenovo A365e'								=> array( 'Lenovo', 'LePhone A365' ),
+			'Lenovo A366t'								=> array( 'Lenovo', 'LePhone A366' ),
+			'Lenovo A390e'								=> array( 'Lenovo', 'LePhone A390' ),
+			'Lenovo A500'								=> array( 'Lenovo', 'LePhone A500' ),
+			'Lenovo A520!'								=> array( 'Lenovo', 'LePhone A520' ),
+			'Lenovo A560e'								=> array( 'Lenovo', 'LePhone A560' ),
+			'Lenovo A580'								=> array( 'Lenovo', 'LePhone A580' ),
+			'Lenovo A586'								=> array( 'Lenovo', 'LePhone A586' ),
+			'Lenovo A630'								=> array( 'Lenovo', 'LePhone A630' ),
+			'Lenovo A660'								=> array( 'Lenovo', 'LePhone A660' ),
+			'Lenovo A690'								=> array( 'Lenovo', 'LePhone A690' ),
+			'Lenovo A668t'								=> array( 'Lenovo', 'LePhone A668' ),
+			'Lenovo A698t'								=> array( 'Lenovo', 'LePhone A698' ),
+			'Lenovo A700e'								=> array( 'Lenovo', 'LePhone A700' ),
+			'Lenovo A710e'								=> array( 'Lenovo', 'LePhone A710' ),
+			'Lenovo A750'								=> array( 'Lenovo', 'LePhone A750' ),
+			'Lenovo A780'								=> array( 'Lenovo', 'LePhone A780' ),
+			'Lenovo A789'								=> array( 'Lenovo', 'LePhone A789' ),
+			'Lenovo A790e'								=> array( 'Lenovo', 'LePhone A790' ),
+			'Lenovo A798t'								=> array( 'Lenovo', 'LePhone A798' ),
+			'Lenovo K860'								=> array( 'Lenovo', 'LePhone K860' ),
+			'Lenovo P70'								=> array( 'Lenovo', 'LePhone P70' ),
+			'Lenovo P700!'								=> array( 'Lenovo', 'LePhone P700' ),
+			'Lenovo S560'								=> array( 'Lenovo', 'S560' ),
+			'Lenovo S680'								=> array( 'Lenovo', 'S680' ),
+			'Lenovo S720'								=> array( 'Lenovo', 'S720' ),
+			'S720i'										=> array( 'Lenovo', 'S720' ),
+			'Lenovo S850e'								=> array( 'Lenovo', 'S850' ),
+			'Lenovo S880'								=> array( 'Lenovo', 'S880' ),
+			'Lenovo ?S899!'								=> array( 'Lenovo', 'S899' ),
+			'A30t'										=> array( 'Lenovo', 'A30t' ),
+			'Lenovo A60+?!'								=> array( 'Lenovo', 'A60' ),
+			'Lenovo A65'								=> array( 'Lenovo', 'A65' ),
+			'Lenovo A66t'								=> array( 'Lenovo', 'A66t' ),
+			'Lenovo A68e'								=> array( 'Lenovo', 'A68e' ),
+			'Lenovo K800'								=> array( 'Lenovo', 'K800' ),
+			'Lenovo K860i'								=> array( 'Lenovo', 'K860' ),
+			'IDEA TV T100'								=> array( 'Lenovo', 'IDEA TV', TYPE_TELEVISION ),
+			'IDEA TV K91'								=> array( 'Lenovo', 'IDEA TV', TYPE_TELEVISION ),
+			'TC970'										=> array( 'Le Pan', 'TC970', TYPE_TABLET ),
+			'LePanII'									=> array( 'Le Pan', 'II', TYPE_TABLET ),
+			'LG-C5(50|55)!'								=> array( 'LG', 'Optimus Chat' ),
+			'LG-C660!'									=> array( 'LG', 'Optimus Pro' ),
+			'LG-C710!'									=> array( 'LG', 'Aloha' ),
+			'LG-C729'									=> array( 'LG', 'DoublePlay' ),
+			'LG-C800G'									=> array( 'LG', 'Eclypse' ),
+			'LG-CX670'									=> array( 'LG', 'Optimus 3G' ),
+			'LG-E400!'									=> array( 'LG', 'Optimus L3' ),
+			'LG-E405!'									=> array( 'LG', 'Optimus L3 Dual' ),
+			'LG-E425!'									=> array( 'LG', 'E425' ),
+			'LG-E430!'									=> array( 'LG', 'E430' ),
+			'LG-E435!'									=> array( 'LG', 'E435' ),
+			'LG-E445!'									=> array( 'LG', 'E445' ),
+			'LG-E450!'									=> array( 'LG', 'E450' ),
+			'LG-E455!'									=> array( 'LG', 'E455' ),
+			'LG-E460!'									=> array( 'LG', 'E460' ),
+			'LG-E510!'									=> array( 'LG', 'Optimus Hub' ),
+			'LG-E6(10|12|17)!'							=> array( 'LG', 'Optimus L5' ),
+			'LG-E615!'									=> array( 'LG', 'Optimus L5 Dual' ),
+			'LG-E720!'									=> array( 'LG', 'Optimus Chic' ),
+			'LG-E730'									=> array( 'LG', 'Optimus Sol' ),
+			'LG-E960'									=> array( 'LG', 'Nexus 4' ),
+			'LG-E9(70|71|73|75|76|77|78)!'				=> array( 'LG', 'Optimus G' ),
+			'LG-E980!'									=> array( 'LG', 'Optimus G2' ),
+			'LG-F100!'									=> array( 'LG', 'Optimus Vu' ),
+			'LG-F120!'									=> array( 'LG', 'Optimus LTE Tag' ),
+			'LG-F160!'									=> array( 'LG', 'Optimus LTE II' ),
+			'LG-F180!'									=> array( 'LG', 'Optimus G' ),
+			'LG-F200!'									=> array( 'LG', 'Optimus Vu 2' ),
+			'LG-F240!'									=> array( 'LG', 'F240' ),
+			'LG-F260!'									=> array( 'LG', 'F260' ),
+			'LG-GT540!'									=> array( 'LG', 'Optimus' ),
+			'LG-GW620'									=> array( 'LG', 'GW620 Eve' ),
+			'LG-KH5200'									=> array( 'LG', 'Andro-1' ),
+			'LG-KU3700'									=> array( 'LG', 'Optimus One' ),
+			'LG-KU5400'									=> array( 'LG', 'PRADA 3.0' ),
+			'LG-KU5900'									=> array( 'LG', 'Optimus Black' ),
+			'LG-L40G'									=> array( 'LG', 'L40G' ),
+			'LG-L160L'									=> array( 'LG', 'L160L' ),
+			'LG-LG730'									=> array( 'LG', 'Venice' ),
+			'LG-LG855'									=> array( 'LG', 'Marquee' ),
+			'LG-LS670'									=> array( 'LG', 'Optimus S' ),
+			'LG-LS696'									=> array( 'LG', 'Elite' ),
+			'LG-LS720'									=> array( 'LG', 'LS720' ),
+			'LG-LS840'									=> array( 'LG', 'Viper' ),
+			'LG-LS855'									=> array( 'LG', 'Marquee' ),
+			'LG-LS860'									=> array( 'LG', 'Mach' ),
+			'LG-LS970'									=> array( 'LG', 'Optimus G' ),
+			'LG-LU3000'									=> array( 'LG', 'Optimus Mach' ),
+			'LG-LU3100'									=> array( 'LG', 'Optimus Chic' ),
+			'LG-LU3700'									=> array( 'LG', 'Optimus One' ),
+			'LG-LU5400'									=> array( 'LG', 'PRADA 3.0' ),
+			'LG-LU6200'									=> array( 'LG', 'Optimus Q2' ),
+			'LG-LU6500'									=> array( 'LG', 'Optimus Note' ),
+			'LG-LU6800'									=> array( 'LG', 'Optimus Big' ),
+			'LG-LU8300'									=> array( 'LG', 'Optimus Pad LTE' ),
+			'LG-LW690'									=> array( 'LG', 'Optimus C' ),
+			'LG-LW770'									=> array( 'LG', 'Regard' ),
+			'LG-MS690'									=> array( 'LG', 'Optimus M' ),
+			'LG-MS770'									=> array( 'LG', 'Motion 4G' ),
+			'LG-MS790'									=> array( 'LG', 'MS790' ),
+			'LG-MS840'									=> array( 'LG', 'Connect 4G' ),
+			'LG-MS870'									=> array( 'LG', 'Spirit 4G' ),
+			'LG-MS910'									=> array( 'LG', 'Esteem' ),
+			'LG-MS695'									=> array( 'LG', 'Optimus M+' ),
+			'LG-P350!'									=> array( 'LG', 'Optimus Me' ),
+			'LG-P355'									=> array( 'LG', 'P355' ),
+			'LG-P5(00|03|04)!'							=> array( 'LG', 'Optimus One' ),
+			'LG-P505!'									=> array( 'LG', 'Phoenix' ),
+			'LG-P506'									=> array( 'LG', 'Thrive' ),
+			'LG-P509'									=> array( 'LG', 'Optimus T' ),
+			'LG-P6(90|98)!'								=> array( 'LG', 'Optimus Net' ),
+			'LG-P693!'									=> array( 'LG', 'P693' ),
+			'LG-P698!'									=> array( 'LG', 'Optimus Net Dual' ),
+			'LG-P7(00|05|08)!'							=> array( 'LG', 'Optimus L7' ),
+			'LG-P710!'									=> array( 'LG', 'P710' ),
+			'LG-P715!'									=> array( 'LG', 'P715' ),
+			'LG-P720!'									=> array( 'LG', 'Optimus Chic' ),
+			'LG-P725'									=> array( 'LG', 'Optimus 3D Max' ),
+			'LG-P7(60|65|68|69)!'						=> array( 'LG', 'Optimus L9' ),
+			'LG-P860'									=> array( 'LG', 'P860' ),
+			'LG-P870!'									=> array( 'LG', 'Escape' ),	
+			'LG-P875!'									=> array( 'LG', 'P875' ),
+			'LG-P880!'									=> array( 'LG', 'Optimus 4X HD' ),
+			'LG-P895'									=> array( 'LG', 'Optimus Vu' ),	
+			'LG-P920!'									=> array( 'LG', 'Optimus 3D' ),
+			'LG-P925!'									=> array( 'LG', 'Thrill' ),
+			'LG-P930'									=> array( 'LG', 'Nitro HD' ),
+			'LG-P9(35|36)!'								=> array( 'LG', 'Optimus LTE' ),
+			'LG-P940'									=> array( 'LG', 'PRADA 3.0' ),
+			'LG-P970!'									=> array( 'LG', 'Optimus Black' ),
+			'LG-P990!'									=> array( 'LG', 'Optimus 2X Speed' ),
+			'LG-P993'									=> array( 'LG', 'Optimus 2X' ),
+			'LG-SU370'									=> array( 'LG', 'Optimus One' ),
+			'LG-SU540'									=> array( 'LG', 'PRADA 3.0' ),
+			'LG-SU640'									=> array( 'LG', 'Optimus LTE' ),
+			'LG-SU660'									=> array( 'LG', 'Optimus 2X' ),
+			'LG-SU760'									=> array( 'LG', 'Optimus 3D' ),
+			'LG-SU870'									=> array( 'LG', 'Optimus 3D Cube' ),
+			'LG-SU880'									=> array( 'LG', 'Optimus EX' ),
+			'LG-US670'									=> array( 'LG', 'Optimus U' ),
+			'LG-US730'									=> array( 'LG', 'Splendor' ),
+			'LG-V900'									=> array( 'LG', 'Optimus Pad', TYPE_TABLET ),
+			'LG-V9(05|09)!'								=> array( 'LG', 'Optimus G-Slate', TYPE_TABLET ),
+			'LG-VM670'									=> array( 'LG', 'Optimus V' ),
+			'LG-VM696'									=> array( 'LG', 'Optimus Elite' ),
+			'LG-VM701'									=> array( 'LG', 'Optimus Slider' ),
+			'LG-VS660'									=> array( 'LG', 'Vortex' ),
+			'LG-VS700'									=> array( 'LG', 'Enlighten' ),
+			'LG-VS740'									=> array( 'LG', 'Ally' ),
+			'LG-VS840'									=> array( 'LG', 'Lucid' ),
+			'LG-VS870'									=> array( 'LG', 'Escape' ),
+			'LG-VS910'									=> array( 'LG', 'Revolution' ),
+			'LG-VS930'									=> array( 'LG', 'Spectrum II' ),
+			'LG-VS950'									=> array( 'LG', 'Intuition' ),
+			'lgp-970'									=> array( 'LG', 'Optimus Black' ),
+			'AS740'										=> array( 'LG', 'Axis' ),
+			'E900'										=> array( 'LG', 'Optimus 7' ),
+			'GT540'										=> array( 'LG', 'Optimus GT540' ),
+			'GW620'										=> array( 'LG', 'Eve' ),
+			'KU9500'									=> array( 'LG', 'Optimus Z' ),
+			'LGC660'									=> array( 'LG', 'Optimus Pro' ),
+			'LGL21'										=> array( 'LG', 'Optimus G' ),
+			'LGL45C'									=> array( 'LG', 'Optimus Net' ),
+			'LGL55C'									=> array( 'LG', 'Optimus Q' ),
+			'LU2300'									=> array( 'LG', 'Optimus Q' ),	
+			'LS670'										=> array( 'LG', 'Optimus S' ),
+			'P940'										=> array( 'LG', 'PRADA 3.0' ),
+			'P990'										=> array( 'LG', 'Optimus 2X Speed' ),
+			'USCC-US730'								=> array( 'LG', 'Splendor' ),
+			'USCC-US760'								=> array( 'LG', 'Genesis' ),
+			'VM670'										=> array( 'LG', 'Optimus V' ),
+			'VS840 4G'									=> array( 'LG', 'Lucid' ),
+			'VS870 4G'									=> array( 'LG', 'Escape' ),
+			'VS900-4G'									=> array( 'LG', 'Enlighten' ),
+			'VS910 4G'									=> array( 'LG', 'Revolution 4G' ),
+			'VS920 4G'									=> array( 'LG', 'Spectrum' ),
+			'VS930 4G'									=> array( 'LG', 'Spectrum 2' ),
+			'VS950 4G'									=> array( 'LG', 'Intuition' ),
+			'L-01D'										=> array( 'LG', 'Optimus LTE' ),
+			'L-01E'										=> array( 'LG', 'Optimus G' ),
+			'L-02D'										=> array( 'LG', 'PRADA phone' ),
+			'L-02E'										=> array( 'LG', 'Optimus LIFE' ),
+			'L-04C'										=> array( 'LG', 'Optimus Chat' ),
+			'L-05D'										=> array( 'LG', 'Optimus it' ),
+			'L-06C'										=> array( 'LG', 'Optimus Pad', TYPE_TABLET ),
+			'L-06D'										=> array( 'LG', 'Optimus Vu' ),
+			'L-07C'										=> array( 'LG', 'Optimus Bright' ),
+			'LG-Eve'									=> array( 'LG', 'Eve' ),
+			'LG-Optimus One P500'						=> array( 'LG', 'Optimus One' ),
+			'LG-Optimus 2X'								=> array( 'LG', 'Optimus 2X' ),
+			'LG-GT540 Optimus'							=> array( 'LG', 'Optimus' ),
+			'LG-Optimus Black'							=> array( 'LG', 'Optimus Black' ),
+			'LG-Optimus V'								=> array( 'LG', 'Optimus V' ),
+			'Ally'										=> array( 'LG', 'Ally' ),
+			'Optimus'									=> array( 'LG', 'Optimus' ),
+			'Optimus Me'								=> array( 'LG', 'Optimus Me' ),
+			'optimus me p350'							=> array( 'LG', 'Optimus Me' ),
+			'Optimus 2X'								=> array( 'LG', 'Optimus 2X' ),
+			'Optimus 2x'								=> array( 'LG', 'Optimus 2X' ),
+			'IS11LG'									=> array( 'LG', 'Optimus X' ),
+			'Vortex'									=> array( 'LG', 'Vortex' ),
+			'LDK-ICK v1.4'								=> array( 'LG', 'Esteem' ),
+			'T6'										=> array( 'Malata', 'Zpad T6', TYPE_TABLET ),
+			'Malata SMBA1002'							=> array( 'Malata', 'Tablet SMB-A1002', TYPE_TABLET ),
+			'MID05V2'									=> array( 'Manta', 'Powertab MID05V2', TYPE_TABLET ),
+			'M-270'										=> array( 'Maylong', 'M-270', TYPE_TABLET ),
+			'MP705C'									=> array( 'Mediacom', 'SmartPad 705c', TYPE_TABLET ),
+			'STM712HCZ'									=> array( 'Mediacom', 'SmartPad 712c', TYPE_TABLET ),
+			'STM803HC'									=> array( 'Mediacom', 'SmartPad 810c', TYPE_TABLET ),
+			'Mediacom 810C'								=> array( 'Mediacom', 'SmartPad 810c', TYPE_TABLET ),
+			'Xteam Smartpad 810c'						=> array( 'Mediacom', 'SmartPad 810c', TYPE_TABLET ),
+			'SmartPad810c'								=> array( 'Mediacom', 'SmartPad 810c', TYPE_TABLET ),
+			'MP810C'									=> array( 'Mediacom', 'SmartPad 810c', TYPE_TABLET ),
+			'M-MP875S2'									=> array( 'Mediacom', 'SmartPad 875 S2', TYPE_TABLET ),
+			'MP907C'									=> array( 'Mediacom', 'SmartPad 907c', TYPE_TABLET ),
+			'932i'										=> array( 'Mediacom', 'SmartPad 932i', TYPE_TABLET ),
+			'MT7003'									=> array( 'Mediadroid', 'Imperius' ),
+			'MTK6516'									=> array( 'Mediatek', 'MTK6516' ),
+			'LIFETAB S9512'								=> array( 'Medion', 'Lifetab S9512', TYPE_TABLET ),
+			'LIFETAB P9514'								=> array( 'Medion', 'Lifetab P9514', TYPE_TABLET ),
+			'MD LIFETAB P9516'							=> array( 'Medion', 'Lifetab P9516', TYPE_TABLET ),
+			'MEDION LIFE P4012'							=> array( 'Medion', 'Life P4012' ),
+			'MEDION LIFE P4310'							=> array( 'Medion', 'Life P4310' ),
+			'M8'										=> array( 'Meizu', 'M8' ),
+			'M9'										=> array( 'Meizu', 'M9' ),
+			'M9-unlocked'								=> array( 'Meizu', 'M9' ),
+			'MEIZU M9'									=> array( 'Meizu', 'M9' ),
+			'MEIZU MX'									=> array( 'Meizu', 'MX' ),
+			'M030'										=> array( 'Meizu', 'MX M030' ),
+			'M031'										=> array( 'Meizu', 'MX M031' ),
+			'M032'										=> array( 'Meizu', 'MX M032' ),
+			'M040'										=> array( 'Meizu', 'M040' ),
+			'Slidepad'									=> array( 'Memup', 'Slidepad', TYPE_TABLET ),
+			'Micromax A44'								=> array( 'Micromax', 'A44 Punk' ),
+			'A45'										=> array( 'Micromax', 'A45 Punk' ),
+			'Micromax A50'								=> array( 'Micromax', 'A50 Ninja' ),
+			'Micromax A52'								=> array( 'Micromax', 'A52 Aisha' ),
+			'Micromax A56'								=> array( 'Micromax', 'A56 Ninja 2' ),
+			'Micromax A57'								=> array( 'Micromax', 'A57 Ninja 3' ),
+			'Micromax A60'								=> array( 'Micromax', 'Andro A60' ),
+			'Micromax A68'								=> array( 'Micromax', 'Smarty A68' ),
+			'Micromax A70'								=> array( 'Micromax', 'Andro A70' ),
+			'Micromax A73'								=> array( 'Micromax', 'A73 Buzz' ),
+			'Micromax A75'								=> array( 'Micromax', 'A75 Lite' ),
+			'Micromax A78'								=> array( 'Micromax', 'A78 Gossip' ),
+			'Micromax A80'								=> array( 'Micromax', 'A80 Infinity' ),
+			'Micromax A84'								=> array( 'Micromax', 'A84' ),
+			'Micromax A85'								=> array( 'Micromax', 'A85' ),
+			'Micromax A87'								=> array( 'Micromax', 'A87 Ninja 4' ),
+			'Micromax A90!'								=> array( 'Micromax', 'A90 Pixel' ),
+			'Micromax A100'								=> array( 'Micromax', 'A100 Canvas' ),
+			'Micromax A110'								=> array( 'Micromax', 'A110 Canvas 2' ),
+			'Micromax P275'								=> array( 'Micromax', 'Funbook Infinity P275', TYPE_TABLET ),
+			'P300(Funbook)'								=> array( 'Micromax', 'Funbook P300', TYPE_TABLET ),
+			'Micromax P350'								=> array( 'Micromax', 'Funbook P350', TYPE_TABLET ),
+			'Micromax P500(Funbook)'					=> array( 'Micromax', 'Funbook Pro P500', TYPE_TABLET ),
+			'Mobiistar Touch S01'						=> array( 'Mobiistar', 'Touch S01' ),	
+			'Cynus T1'									=> array( 'Mobistel', 'Cynus T1' ),				
+			'AT735'										=> array( 'Moinstone', 'AT735', TYPE_TABLET ),
+			'A853'										=> array( 'Motorola', 'Milestone' ),
+			'A953'										=> array( 'Motorola', 'Milestone 2' ),
+			'A1680'										=> array( 'Motorola', 'MOTO A1680' ),
+			'ET1'										=> array( 'Motorola', 'ET1 Enterprise Tablet', TYPE_TABLET ),
+			'MB200'										=> array( 'Motorola', 'CLIQ' ),
+			'MB300'										=> array( 'Motorola', 'BACKFLIP' ),
+			'MB501'										=> array( 'Motorola', 'CLIQ XT' ),
+			'MB502'										=> array( 'Motorola', 'CHARM' ),
+			'MB508'										=> array( 'Motorola', 'FLIPSIDE' ),
+			'MB511'										=> array( 'Motorola', 'FLIPOUT' ),
+			'MB520'										=> array( 'Motorola', 'BRAVO' ),
+			'MB525!'									=> array( 'Motorola', 'DEFY' ),
+			'MB526'										=> array( 'Motorola', 'DEFY+' ),
+			'MB611'										=> array( 'Motorola', 'CLIQ 2' ),
+			'MB612'										=> array( 'Motorola', 'XPRT' ),
+			'MB632'										=> array( 'Motorola', 'PRO+' ),
+			'MB855'										=> array( 'Motorola', 'PHOTON 4G' ),
+			'MB8(60|61)!'								=> array( 'Motorola', 'ATRIX' ),
+			'MB865'										=> array( 'Motorola', 'ATRIX 2' ),
+			'MB870'										=> array( 'Motorola', 'Droid X2' ),
+			'MB886'										=> array( 'Motorola', 'DINARA' ),
+			'ME501'										=> array( 'Motorola', 'CLIQ XT' ),
+			'ME511'										=> array( 'Motorola', 'FLIPOUT' ),
+			'ME525!'									=> array( 'Motorola', 'MOTO ME525' ),
+			'ME600'										=> array( 'Motorola', 'BACKFLIP' ),
+			'ME632'										=> array( 'Motorola', 'PRO+' ),
+			'ME722'										=> array( 'Motorola', 'Milestone 2' ),
+			'ME811'										=> array( 'Motorola', 'Droid X' ),
+			'ME860'										=> array( 'Motorola', 'ATRIX' ),
+			'ME863'										=> array( 'Motorola', 'Milestone 3' ),
+			'ME865'										=> array( 'Motorola', 'ATRIX 2' ),
+			'MT620!'									=> array( 'Motorola', 'MOTO MT620' ),
+			'MT716'										=> array( 'Motorola', 'MOTO MT716' ),
+			'MT810'										=> array( 'Motorola', 'MOTO MT810' ),
+			'MT870'										=> array( 'Motorola', 'MOTO MT870' ),
+			'MT917'										=> array( 'Motorola', 'MT917' ),
+			'MZ505'										=> array( 'Motorola', 'XOOM Family Edition', TYPE_TABLET ),
+			'MZ600'										=> array( 'Motorola', 'XOOM 4G LTE', TYPE_TABLET ),
+			'MZ601'										=> array( 'Motorola', 'XOOM 3G', TYPE_TABLET ),
+			'MZ602'										=> array( 'Motorola', 'XOOM 4G LTE', TYPE_TABLET ),
+			'MZ603'										=> array( 'Motorola', 'XOOM 3G', TYPE_TABLET ),
+			'MZ604'										=> array( 'Motorola', 'XOOM WiFi', TYPE_TABLET ),
+			'MZ605'										=> array( 'Motorola', 'XOOM 3G', TYPE_TABLET ),
+			'MZ606'										=> array( 'Motorola', 'XOOM WiFi', TYPE_TABLET ),
+			'MZ607'										=> array( 'Motorola', 'XOOM 2 WiFi Media Edition', TYPE_TABLET ),
+			'MZ609!'									=> array( 'Motorola', 'Droid XYBOARD 8.2', TYPE_TABLET ),
+			'MZ615'										=> array( 'Motorola', 'XOOM 2 WiFi', TYPE_TABLET ),
+			'MZ617!'									=> array( 'Motorola', 'Droid XYBOARD 10.1', TYPE_TABLET ),
+			'WX435'										=> array( 'Motorola', 'TRIUMPH WX435' ),
+			'WX445'										=> array( 'Motorola', 'CITRUS WX445' ),
+			'XT300'										=> array( 'Motorola', 'SPICE' ),
+			'XT301'										=> array( 'Motorola', 'MOTO XT301' ),
+			'XT303'										=> array( 'Motorola', 'MOTOSMART XT303' ),
+			'XT311'										=> array( 'Motorola', 'FIRE' ),
+			'XT316'										=> array( 'Motorola', 'MOTO XT316' ),
+			'XT319'										=> array( 'Motorola', 'MOTO XT319' ),
+			'XT3(20|21)!'								=> array( 'Motorola', 'DEFY Mini' ),
+			'XT389'										=> array( 'Motorola', 'MOTOSMART XT389' ),
+			'XT390'										=> array( 'Motorola', 'MOTOSMART XT390' ),
+			'XT500'										=> array( 'Motorola', 'MOTO XT500' ),
+			'xt-500'									=> array( 'Motorola', 'MOTO XT500' ),
+			'XT502'										=> array( 'Motorola', 'QUENCH XT5' ),
+			'XT5(30|31)!'								=> array( 'Motorola', 'FIRE XT' ),
+			'XT532'										=> array( 'Motorola', 'MOTO XT532' ),	
+			'XT535'										=> array( 'Motorola', 'DEFY' ),	
+			'XT536'										=> array( 'Motorola', 'DEFY Diana' ),	
+			'XT550'										=> array( 'Motorola', 'MOTOSMART MIX' ),	
+			'XT5(56|57)!'								=> array( 'Motorola', 'DEFY XT' ),	
+			'XT603'										=> array( 'Motorola', 'ADMIRAL' ),
+			'XT605'										=> array( 'Motorola', 'XT605' ),	
+			'XT610'										=> array( 'Motorola', 'Droid Pro' ),
+			'XT615'										=> array( 'Motorola', 'MOTO XT615' ),
+			'XT626'										=> array( 'Motorola', 'MOTO XT626' ),
+			'XT681'										=> array( 'Motorola', 'MOTO XT681' ),
+			'XT682'										=> array( 'Motorola', 'Droid 3' ),
+			'XT685'										=> array( 'Motorola', 'MOTO XT685' ),
+			'XT687'										=> array( 'Motorola', 'ATRIX TV' ),
+			'XT701'										=> array( 'Motorola', 'XT701' ),
+			'XT702'										=> array( 'Motorola', 'MOTO XT702' ),
+			'XT711'										=> array( 'Motorola', 'MOTO XT711' ),
+			'XT720'										=> array( 'Motorola', 'Milestone' ),
+			'XT788'										=> array( 'Motorola', 'XT788' ),
+			'XT875'										=> array( 'Motorola', 'Droid Bionic' ),
+			'XT800W'									=> array( 'Motorola', 'MOTO Glam' ),
+			'XT800!'									=> array( 'Motorola', 'MOTO XT800' ),
+			'XT806'										=> array( 'Motorola', 'MOTO XT806' ),
+			'XT8(60|83)!'								=> array( 'Motorola', 'Milestone 3' ),
+			'XT862'										=> array( 'Motorola', 'Droid 3' ),
+			'XT881'										=> array( 'Motorola', 'Electrify 2' ),
+			'XT882'										=> array( 'Motorola', 'MOTO XT882' ),
+			'XT8(85|86)!'								=> array( 'Motorola', 'RAZR V' ),
+			'XT889'										=> array( 'Motorola', 'XT889' ),
+			'XT890'										=> array( 'Motorola', 'RAZR i' ),
+			'XT8(94|97)!'								=> array( 'Motorola', 'Droid 4' ),
+			'XT9(01|10)!'								=> array( 'Motorola', 'RAZR' ),
+			'XT907'										=> array( 'Motorola', 'Droid RAZR M' ),
+			'XT912!'									=> array( 'Motorola', 'Droid RAZR' ),
+			'XT9(23|25|26)!'							=> array( 'Motorola', 'Droid RAZR HD' ),
+			'XT928'										=> array( 'Motorola', 'XT928' ),
+			'201M'										=> array( 'Motorola', 'Droid RAZR M' ),
+			'Atrix 2'									=> array( 'Motorola', 'ATRIX 2' ),
+			'Atrix 4G'									=> array( 'Motorola', 'ATRIX 4G' ),
+			'Atrix 4G ME860'							=> array( 'Motorola', 'ATRIX 4G' ),
+			'CLIQ'										=> array( 'Motorola', 'CLIQ' ),
+			'CLIQ XT'									=> array( 'Motorola', 'CLIQ XT' ),
+			'CLIQ2'										=> array( 'Motorola', 'CLIQ 2' ),
+			'Corvair'									=> array( 'Motorola', 'Corvair', TYPE_TABLET ),
+			'DEFY'										=> array( 'Motorola', 'DEFY' ),
+			'Defy(\\+| Plus)!'							=> array( 'Motorola', 'DEFY+' ),
+			'DEDY+'										=> array( 'Motorola', 'DEFY+' ),
+			'Dext'										=> array( 'Motorola', 'Dext' ),
+			'Droid'										=> array( 'Motorola', 'Droid' ),
+			'DROID'										=> array( 'Motorola', 'Droid' ),
+			'DROID ?2!'									=> array( 'Motorola', 'Droid 2' ),
+			'DROID ?3!'									=> array( 'Motorola', 'Droid 3' ),
+			'DROID ?4!'									=> array( 'Motorola', 'Droid 4' ),
+			'DROID Pro'									=> array( 'Motorola', 'Droid Pro' ),
+			'DROID BIONIC!'								=> array( 'Motorola', 'Droid Bionic' ),
+			'DROID RAZR HD!'							=> array( 'Motorola', 'Droid RAZR HD' ),
+			'DROID ?RAZR!'								=> array( 'Motorola', 'Droid RAZR' ),
+			'DROID SPYDER'								=> array( 'Motorola', 'Droid RAZR' ),
+			'DROID ?X2!'								=> array( 'Motorola', 'Droid X2' ),
+			'DROID ?X!'									=> array( 'Motorola', 'Droid X' ),
+			'Devour'									=> array( 'Motorola', 'Droid Devour' ),
+			'calgary'									=> array( 'Motorola', 'Droid Devour' ),
+			'Electrify'									=> array( 'Motorola', 'Electrify' ),
+			'Milestone XT720'							=> array( 'Motorola', 'Milestone' ),
+			'Milestone'									=> array( 'Motorola', 'Milestone' ),
+			'A853 Milestone'							=> array( 'Motorola', 'Milestone' ),
+			'Milestone X'								=> array( 'Motorola', 'Milestone X' ),
+			'Milestone X2'								=> array( 'Motorola', 'Milestone X2' ),
+			'MotoroiX'									=> array( 'Motorola', 'Droid X' ),
+			'Moto Backflip'								=> array( 'Motorola', 'BACKFLIP' ),
+			'RAZR'										=> array( 'Motorola', 'RAZR' ),
+			'Triumph'									=> array( 'Motorola', 'TRIUMPH' ),
+			'Opus One'									=> array( 'Motorola', 'i1' ),
+			'Photon'									=> array( 'Motorola', 'PHOTON' ),
+			'Photon 4G'									=> array( 'Motorola', 'PHOTON 4G' ),
+			'XOOM'										=> array( 'Motorola', 'XOOM', TYPE_TABLET ),
+			'XOOM 2!'									=> array( 'Motorola', 'XOOM 2', TYPE_TABLET ),
+			'XOOM MZ606'								=> array( 'Motorola', 'XOOM WiFi', TYPE_TABLET ),
+			'ISW11M'									=> array( 'Motorola', 'PHOTON' ),
+			'IS12M'										=> array( 'Motorola', 'RAZR' ),
+			'MOTWX435KT'								=> array( 'Motorola', 'TRIUMPH' ),
+			'X3-Ice MIUI XT720 Memorila Classics'		=> array( 'Motorola', 'Milestone' ),
+			'Enjoy 7 Plus'								=> array( 'MSI', 'WindPad Enjoy 7 Plus', TYPE_TABLET ),
+			'A878 Duo'									=> array( 'MyPhone', 'A878 Duo' ),
+			'A898 Duo'									=> array( 'MyPhone', 'A898 Duo' ),
+			'NABI-A'									=> array( 'Nabi', 'Kids tablet', TYPE_TABLET ),
+			'N1'										=> array( 'Newman', 'N1' ),
+			'Newpad'									=> array( 'Newsmy', 'Newpad', TYPE_TABLET ),
+			'Newpad-K97'								=> array( 'Newsmy', 'Newpad K97', TYPE_TABLET ),
+			'Newpad P9'									=> array( 'Newsmy', 'Newpad P9', TYPE_TABLET ),
+			'M-PAD N8'									=> array( 'Newsmy', 'M-pad N8', TYPE_TABLET ),
+			'LT-NA7'									=> array( 'NEC', 'LT-NA7' ),
+			'N-01D'										=> array( 'NEC', 'MEDIAS PP N-01D' ),
+			'N-04C'										=> array( 'NEC', 'MEDIAS N-04C' ),
+			'N-04D'										=> array( 'NEC', 'MEDIAS LTE N-04D' ),
+			'N-05D'										=> array( 'NEC', 'MEDIAS ES N-05D' ),
+			'N-06C'										=> array( 'NEC', 'MEDIAS WP N-06C' ),
+			'N-06D'										=> array( 'NEC', 'MEDIAS Tab N-06D', TYPE_TABLET ),
+			'N-07D'										=> array( 'NEC', 'MEDIAS X N-07D' ),
+			'101N'										=> array( 'NEC', 'MEDIAS CH Softbank 101N' ),
+			'IS11N'										=> array( 'NEC', 'MEDIAS BR IS11N' ),
+			'Nexian NX-A890'							=> array( 'Nexian', 'Journey' ),
+			'NX-A890'									=> array( 'Nexian', 'Journey' ),
+			'NX-A891'									=> array( 'Nexian', 'Ultra Journey' ),
+			'M726HC'									=> array( 'Nextbook', 'Premium 7', TYPE_EREADER ),
+			'Next7P12!'									=> array( 'Nextbook', 'Premium 7', TYPE_EREADER ),
+			'NXM726HN'									=> array( 'Nextbook', 'Premium 7', TYPE_EREADER ),
+			'NXM727KC!'									=> array( 'Nextbook', 'Premium 7', TYPE_EREADER ),
+			'Next8P12'									=> array( 'Nextbook', 'Premium 8', TYPE_EREADER ),
+			'NXM803HD'									=> array( 'Nextbook', 'Premium 8', TYPE_EREADER ),
+			'DATAM803HC'								=> array( 'Nextbook', 'Premium 8', TYPE_EREADER ),
+			'NXM901'									=> array( 'Nextbook', 'Next 3', TYPE_EREADER),
+			'NGM Vanity Smart'							=> array( 'NGM', 'Vanity Smart' ),
+			'Nokia N9'									=> array( 'Nokia', 'N9' ),
+			'Nokia N900'								=> array( 'Nokia', 'N900' ),
+			'Lumia800'									=> array( 'Nokia', 'Lumia 800' ),
+			'Lumia 900'									=> array( 'Nokia', 'Lumia 900' ),
+			'Notion Ink ADAM'							=> array( 'Notion Ink', 'ADAM', TYPE_TABLET ),
+			'Adam'										=> array( 'Notion Ink', 'ADAM', TYPE_TABLET ),
+			'P4D Sirius'								=> array( 'Nvsbl', 'P4D SIRIUS', TYPE_TABLET ),
+			'EFM710A'									=> array( 'Oblio', 'Mint 7x', TYPE_TABLET ),
+			'ODYS-Xpress'								=> array( 'Odys', 'Xpress', TYPE_TABLET ),
+			'Olivetti Olipad 100'						=> array( 'Olivetti', 'Olipad 100', TYPE_TABLET ),
+			'OP110'										=> array( 'Olivetti', 'Olipad 110', TYPE_TABLET ),
+			'ONDA MID'									=> array( 'Onda', 'MID', TYPE_TABLET ),
+			'VX580A'									=> array( 'Onda', 'VX580A', TYPE_TABLET ),
+			'VX610A'									=> array( 'Onda', 'VX610A', TYPE_TABLET ),
+			'TQ150'										=> array( 'Onda', 'TQ150' ),
+			'TT101'										=> array( 'Onda', 'TT101', TYPE_TABLET ),
+			'N2T'										=> array( 'ONN', 'N2T', TYPE_TABLET ),
+			'Renesas!'									=> array( 'Opad', 'Renesas', TYPE_TABLET ),
+			'X903'										=> array( 'Oppo', 'Find Me X903' ),
+			'X905'										=> array( 'Oppo', 'Find 3 X905' ),
+			'OPPOX905'									=> array( 'Oppo', 'Find 3 X905' ),
+			'X907'										=> array( 'Oppo', 'Finder X907' ),
+			'OPPOX907'									=> array( 'Oppo', 'Finder X907' ),
+			'X9015'										=> array( 'Oppo', 'Find X9015' ),
+			'OPPOX9015'									=> array( 'Oppo', 'Find X9015' ),
+			'OPPOX9017'									=> array( 'Oppo', 'Finder X9017' ),
+			'R801'										=> array( 'Oppo', 'Real R801' ),
+			'OPPOR801'									=> array( 'Oppo', 'Real R801' ),
+			'OPPOR805'									=> array( 'Oppo', 'Real R805' ),
+			'OPPOR807'									=> array( 'Oppo', 'Real R807' ),
+			'OPPOR817'									=> array( 'Oppo', 'Real R817' ),
+			'OPPOT29'									=> array( 'Oppo', 'T29' ),
+			'OPPOT703'									=> array( 'Oppo', 'T703' ),
+			'OPPOU701'									=> array( 'Oppo', 'Ulike U701' ),
+			'OPPOU7011'									=> array( 'Oppo', 'Find Gemini U7011' ),
+			'P-01D'										=> array( 'Panasonic', 'P-01D' ),
+			'P-02D'										=> array( 'Panasonic', 'Lumix Phone' ),
+			'P-04D'										=> array( 'Panasonic', 'Eluga' ),
+			'P-06D'										=> array( 'Panasonic', 'Eluga V' ),
+			'P-07C'										=> array( 'Panasonic', 'P-07C' ),
+			'P-07D'										=> array( 'Panasonic', 'Eluga Power' ),
+			'P-08D'										=> array( 'Panasonic', 'Eluga Live' ),
+			'dL1'										=> array( 'Panasonic', 'Eluga dL1' ),
+			'101P'										=> array( 'Panasonic', 'Lumix Phone' ),
+			'JT-H580VT'									=> array( 'Panasonic', 'BizPad 7', TYPE_TABLET ),
+			'JT-H581VT'									=> array( 'Panasonic', 'BizPad 10', TYPE_TABLET ),
+			'FZ-A1(A|B)!'								=> array( 'Panasonic', 'Toughpad', TYPE_TABLET ),
+			'pandigital9hr'								=> array( 'Pandigital', '9HR', TYPE_TABLET ),
+			'pandigital9hr2'							=> array( 'Pandigital', '9HR2', TYPE_TABLET ),
+			'pandigitalopc1'							=> array( 'Pandigital', 'OPC1', TYPE_TABLET ),
+			'pandigitalopp1'							=> array( 'Pandigital', 'OPP1', TYPE_TABLET ),
+			'pandigitalp1hr'							=> array( 'Pandigital', 'p1hr', TYPE_TABLET ),
+			'IM-A600!'									=> array( 'Pantech', 'SIRIUS α' ),
+			'IM-A630!'									=> array( 'Pantech', 'Izar' ),
+			'IM-A650!'									=> array( 'Pantech', 'Vega' ),
+			'IM-A690!'									=> array( 'Pantech', 'Mirach' ),
+			'IM-A7(10|20)!'								=> array( 'Pantech', 'VegaXpress' ),
+			'IM-A725!'									=> array( 'Pantech', 'Vega X+' ),
+			'IM-A730!'									=> array( 'Pantech', 'Vega S' ),
+			'IM-A7(40|50)!'								=> array( 'Pantech', 'Mirach A' ),
+			'IM-A7(60|70|75|80)!'						=> array( 'Pantech', 'Vega Racer' ),
+			'IM-A800!'									=> array( 'Pantech', 'Vega LTE' ),
+			'IM-A810!'									=> array( 'Pantech', 'Vega LTE M' ),
+			'IM-A820!'									=> array( 'Pantech', 'Vega LTE EX' ),
+			'IM-A830!'									=> array( 'Pantech', 'Vega Racer 2' ),
+			'IM-A840!'									=> array( 'Pantech', 'Vega S5' ),
+			'IM-A850!'									=> array( 'Pantech', 'Vega R3' ),
+			'IM-A860!'									=> array( 'Pantech', 'IM-A860' ),
+			'IM-T100K'									=> array( 'Pantech', 'Vega N˚ 5', TYPE_TABLET ),
+			'IS06'										=> array( 'Pantech', 'SIRIUS α' ),
+			'ADR8995!'									=> array( 'Pantech', 'Breakout' ),
+			'ADR910L 4G'								=> array( 'Pantech', 'Marauder' ),
+			'ADR930L 4G'								=> array( 'Pantech', 'Perception' ),
+			'PantechP4100'								=> array( 'Pantech', 'Element', TYPE_TABLET ),
+			'PantechP8000'								=> array( 'Pantech', 'Crossover' ),
+			'PantechP8010'								=> array( 'Pantech', 'Flex' ),
+			'PantechP9060'								=> array( 'Pantech', 'Pocket' ),
+			'PantechP9070'								=> array( 'Pantech', 'Burst' ),
+			'PantechP9090'								=> array( 'Pantech', 'Magnus' ),
+			'SKY IM-A600S'								=> array( 'Pantech', 'SIRIUS α' ),
+			'SKY IM-A630K'								=> array( 'Pantech', 'Izar' ),
+			'SKY IM-A650S'								=> array( 'Pantech', 'Vega' ),
+			'IS11PT'									=> array( 'Pantech', 'Mirach IS11PT' ),
+			'PAT712W'									=> array( 'Perfeo', 'PAT712W', TYPE_TABLET ),
+			'X7G'										=> array( 'Pearl', 'Touchlet X7G', TYPE_TABLET ),
+			'PP4MT-7'									=> array( 'Pendo', 'Pendopad 4', TYPE_TABLET ),
+			'FWS710EU'									=> array( 'Phicomm', 'FWS710' ),
+			'FWS810'									=> array( 'Phicomm', 'FWS810' ),
+			'Philips PI5000'							=> array( 'Philips', 'PI5000', TYPE_TABLET ),
+			'PI7000'									=> array( 'Philips', 'PI7000', TYPE_TABLET ),
+			'Philips W536'								=> array( 'Philips', 'W536' ),
+			'Philips W626'								=> array( 'Philips', 'W626' ),
+			'Philips W632'								=> array( 'Philips', 'W632' ),
+			'MOMO'										=> array( 'Ployer', 'MOMO', TYPE_TABLET ),
+			'MOMO7'										=> array( 'Ployer', 'MOMO7', TYPE_TABLET ),
+			'MOMO7 Talent'								=> array( 'Ployer', 'MOMO7 Talent', TYPE_TABLET ),
+			'MOMO8'										=> array( 'Ployer', 'MOMO8', TYPE_TABLET ),
+			'MOMO9'										=> array( 'Ployer', 'MOMO9', TYPE_TABLET ),
+			'MOMO9 STAR'								=> array( 'Ployer', 'MOMO9 Star', TYPE_TABLET ),
+			'MOMO11Speed'								=> array( 'Ployer', 'MOMO11 Speed', TYPE_TABLET ),
+			'MOMO15'									=> array( 'Ployer', 'MOMO15', TYPE_TABLET ),
+			'PocketBook A7'								=> array( 'PocketBook', 'A7', TYPE_TABLET ),
+			'PocketBook A10'							=> array( 'PocketBook', 'A10', TYPE_TABLET ),
+			'Mobii 7'									=> array( 'Point Of View', 'Mobii 7', TYPE_TABLET ),
+			'POV TAB-PROTAB30-IPS10'					=> array( 'Point Of View', 'ProTab 30', TYPE_TABLET ),
+			'MIDC409'									=> array( 'Polaroid', 'Diamond III', TYPE_TABLET ),
+			'PMID4311'									=> array( 'Polaroid', 'PMID 4311', TYPE_TABLET ),
+			'PMID701C'									=> array( 'Polaroid', 'PMID 701c', TYPE_TABLET ),
+			'POLY PAD 9716HD'							=> array( 'Polypad', '9716 HD', TYPE_TABLET ),
+			'ACT2000'									=> array( 'Poptronix', 'ACT2000', TYPE_TABLET ),
+			'PMP3384BRU'								=> array( 'Prestigio', 'Multipad 3384', TYPE_TABLET ),
+			'PMP5080CPRO'								=> array( 'Prestigio', 'Multipad 5080 Pro', TYPE_TABLET ),
+			'TB07FTA'									=> array( 'Positivo', 'TB07FTA', TYPE_TABLET ),
+			'QW TB-1207'								=> array( 'Qware', 'Pro3', TYPE_TABLET ),
+			'W6'										=> array( 'Ramos', 'W6', TYPE_TABLET ),
+			'W6HD ICS'									=> array( 'Ramos', 'W6HD', TYPE_TABLET ),
+			'W10'										=> array( 'Ramos', 'W10', TYPE_TABLET ),
+			'W10 V2.0'									=> array( 'Ramos', 'W10 v2.0', TYPE_TABLET ),
+			'W17PRO(Dualcore)'							=> array( 'Ramos', 'W17 Pro Dual Core', TYPE_TABLET ),
+			'W22PRO'									=> array( 'Ramos', 'W22 Pro', TYPE_TABLET ),
+			'W28(Dualcore)'								=> array( 'Ramos', 'W28 Dual Core', TYPE_TABLET ),
+			'T11AD!'									=> array( 'Ramos', 'T11AD', TYPE_TABLET ),
+			'Readboy G12'								=> array( 'Readboy', 'G12', TYPE_TABLET ),
+			'Rikomagic MK802'							=> array( 'Rikomagic', 'MK802', TYPE_TELEVISION ),
+			'PlayBook'									=> array( 'RIM', 'BlackBerry PlayBook', TYPE_TABLET ),
+			'RBK-490'									=> array( 'Ritmix', 'RBK-490', TYPE_TABLET ),
+			'A8HD'										=> array( 'Saayi', 'Dropad A8HD', TYPE_TABLET ),
+			'EK-GC100'									=> array( 'Samsung', 'Galaxy Camera', TYPE_CAMERA ),
+			'GT-B5330!'									=> array( 'Samsung', 'Galaxy Chat' ),
+			'GT-B5510!'									=> array( 'Samsung', 'Galaxy Y Pro' ),
+			'GT-B5512!'									=> array( 'Samsung', 'Galaxy Y Pro Duos' ),
+			'GT-B7510!'									=> array( 'Samsung', 'Galaxy Pro' ),
+			'GT-B9062'									=> array( 'Samsung', 'GT-B9062' ),
+			'GT-I55(00|03|08)!'							=> array( 'Samsung', 'Galaxy 5' ),
+			'GT-I5510!'									=> array( 'Samsung', 'Galaxy 551' ),
+			'GT-I5700!'									=> array( 'Samsung', 'Galaxy Spica' ),
+			'GT-I58(00|01)!'							=> array( 'Samsung', 'Galaxy Apollo' ),
+			'GT-I6500!'									=> array( 'Samsung', 'Saturn' ),
+			'GT-I777!'									=> array( 'Samsung', 'Singa' ),
+			'GT-I8000!'									=> array( 'Samsung', 'Omnia 2' ),
+			'GT-I8150!'									=> array( 'Samsung', 'Galaxy W' ),
+			'GT-I8160!'									=> array( 'Samsung', 'Galaxy Ace 2' ),
+			'GT-I8190!'									=> array( 'Samsung', 'Galaxy S III Mini' ),
+			'GT-I8250!'									=> array( 'Samsung', 'GT-I8250' ),
+			'GT-I8320!'									=> array( 'Samsung', 'H1' ),
+			'GT-I85(20|30)!'							=> array( 'Samsung', 'Galaxy Beam' ),
+			'GT-I8730!'									=> array( 'Samsung', 'Express' ),							
+			'GT-I90(00|08|18|88)!'						=> array( 'Samsung', 'Galaxy S' ),
+			'GT-I9001!'									=> array( 'Samsung', 'Galaxy S Plus' ),
+			'GT-I9003!'									=> array( 'Samsung', 'Galaxy SL' ),
+			'GT-I9010!'									=> array( 'Samsung', 'Galaxy S Giorgio Armani' ),
+			'GT-I9050!'									=> array( 'Samsung', 'GT-I9050' ),
+			'GT-I9070!'									=> array( 'Samsung', 'Galaxy S Advance' ),
+			'GT-I91(00|08)!'							=> array( 'Samsung', 'Galaxy S II' ),
+			'GT-I9103!'									=> array( 'Samsung', 'Galaxy R' ),
+			'GT-I9210!'									=> array( 'Samsung', 'Galaxy S II LTE' ),
+			'GT-I92(20|28)!'							=> array( 'Samsung', 'Galaxy Note' ),
+			'GT-I9250!'									=> array( 'Samsung', 'Galaxy Nexus' ),
+			'GT-I9260'									=> array( 'Samsung', 'Galaxy Premier' ),
+			'GT-I93(00|03|05|08)!'						=> array( 'Samsung', 'Galaxy S III' ),
+			'GT-I95(00|05)!'							=> array( 'Samsung', 'Galaxy S IV' ),
+			'GT-I9800!'									=> array( 'Samsung', 'GT-I9800' ),
+			'GT-N5100'									=> array( 'Samsung', 'Galaxy Note 8.0', TYPE_TABLET ),
+			'GT-N70(00|05)!'							=> array( 'Samsung', 'Galaxy Note' ),
+			'GT-N71(00|02|05|08)!'						=> array( 'Samsung', 'Galaxy Note II' ),
+			'GT-N80(00|05|10|13|20)!'					=> array( 'Samsung', 'Galaxy Note 10.1', TYPE_TABLET ),
+			'GT-P10(00|10)!'							=> array( 'Samsung', 'Galaxy Tab', TYPE_TABLET ),
+			'GT-P31(00|10|13)!'							=> array( 'Samsung', 'Galaxy Tab 2 (7.0)', TYPE_TABLET ),
+			'GT-P32(00|10)!'							=> array( 'Samsung', 'Galaxy Tab 3 (7.0)', TYPE_TABLET ),
+			'GT-P51(00|10|13)!'							=> array( 'Samsung', 'Galaxy Tab 2 (10.1)', TYPE_TABLET ),
+			'GT-P52(00|10)!'							=> array( 'Samsung', 'Galaxy Tab 3 (10.1)', TYPE_TABLET ),
+			'GT-P62(00|10)!'							=> array( 'Samsung', 'Galaxy Tab 7.0 Plus', TYPE_TABLET ),
+			'GT-P62(01|11)!'							=> array( 'Samsung', 'Galaxy Tab 7.0 Plus N', TYPE_TABLET ),
+			'GT-P68(00|10)!'							=> array( 'Samsung', 'Galaxy Tab 7.7', TYPE_TABLET ),
+			'GT-P7100!'									=> array( 'Samsung', 'Galaxy Tab 10.1V', TYPE_TABLET ),
+			'GT-P73(00|10|20)!'							=> array( 'Samsung', 'Galaxy Tab 8.9', TYPE_TABLET ),
+			'GT-P75(00|10)!'							=> array( 'Samsung', 'Galaxy Tab 10.1', TYPE_TABLET ),
+			'GT-P75(01|11)!'							=> array( 'Samsung', 'Galaxy Tab 10.1N', TYPE_TABLET ),
+			'GT-P8110!'									=> array( 'Samsung', 'Nexus 10', TYPE_TABLET ),
+			'GT-P8200!'									=> array( 'Samsung', 'Galaxy Tab "Roma"', TYPE_TABLET ),
+			'GT-S5300!'									=> array( 'Samsung', 'Galaxy Pocket' ),
+			'GT-S5302!'									=> array( 'Samsung', 'Galaxy Pocket Duos' ),
+			'GT-S53(60|63|69)!'							=> array( 'Samsung', 'Galaxy Y' ),
+			'GT-S5367!'									=> array( 'Samsung', 'Galaxy Y TV' ),
+			'GT-S5368!'									=> array( 'Samsung', 'GT-S5368' ),
+			'GT-S55(70|78)!'							=> array( 'Samsung', 'Galaxy Mini' ),
+			'GT-S5660!'									=> array( 'Samsung', 'Galaxy Gio' ),
+			'GT-S5670!'									=> array( 'Samsung', 'Galaxy Fit' ),
+			'GT-S5690!'									=> array( 'Samsung', 'Galaxy Xcover' ),
+			'GT-S58(20|30|38|39)!'						=> array( 'Samsung', 'Galaxy Ace' ),
+			'GT-S6010'									=> array( 'Samsung', 'Galaxy Music' ),
+			'GT-S6012!'									=> array( 'Samsung', 'Galaxy Music Duos' ),
+			'GT-S6102!'									=> array( 'Samsung', 'Galaxy Y Duos' ),
+			'GT-S6352'									=> array( 'Samsung', 'Galaxy Ace Duos' ),
+			'GT-S6358'									=> array( 'Samsung', 'Galaxy Ace' ),
+			'GT-S6500!'									=> array( 'Samsung', 'Galaxy Mini 2' ),
+			'GT-S6702!'									=> array( 'Samsung', 'Galaxy Y Duos' ),
+			'GT-S6802!'									=> array( 'Samsung', 'Galaxy Ace Duos' ),
+			'GT-S7500!'									=> array( 'Samsung', 'Galaxy Ace Plus' ),
+			'GT-S7560!'									=> array( 'Samsung', 'Galaxy Ace II x' ),
+			'GT-S7562!'									=> array( 'Samsung', 'Galaxy S Duos' ),
+			'GT-S7710!'									=> array( 'Samsung', 'Galaxy Xcover 2' ),
+			'GT-T959!'									=> array( 'Samsung', 'Galaxy S Vibrant' ),
+			'SCH-i509'									=> array( 'Samsung', 'Galaxy Y' ),
+			'SCH-i559'									=> array( 'Samsung', 'Galaxy Pop' ),
+			'SCH-i569'									=> array( 'Samsung', 'Galaxy Gio' ),
+			'SCH-i579'									=> array( 'Samsung', 'Galaxy Ace' ),
+			'SCH-i589'									=> array( 'Samsung', 'Galaxy Ace Duos' ),
+			'SCH-i705!'									=> array( 'Samsung', 'Galaxy Tab 2 (7.0)', TYPE_TABLET ),
+			'SCH-i809'									=> array( 'Samsung', 'SCH-i809' ),
+			'SCH-i889'									=> array( 'Samsung', 'Galaxy Note' ),
+			'SCH-i909'									=> array( 'Samsung', 'Galaxy S' ),
+			'SCH-i919'									=> array( 'Samsung', 'Galaxy S Duos' ),
+			'SCH-i929'									=> array( 'Samsung', 'Galaxy S II Duos' ),
+			'SCH-I100'									=> array( 'Samsung', 'Gem' ),
+			'SCH-I110'									=> array( 'Samsung', 'Illusion' ),
+			'SCH-I200( 4G)?$!'							=> array( 'Samsung', 'Galaxy Stellar' ),
+			'SCH-I339'									=> array( 'Samsung', 'SCH-I339' ),
+			'SCH-I400'									=> array( 'Samsung', 'Continuum' ),
+			'SCH-I405( 4G)?$!'							=> array( 'Samsung', 'Stratosphere' ),
+			'SCH-I405U'									=> array( 'Samsung', 'Galaxy Metrix' ),
+			'SCH-I500'									=> array( 'Samsung', 'Fascinate' ),
+			'SCH-I510'									=> array( 'Samsung', 'Stealth V' ),
+			'SCH-I510 4G'								=> array( 'Samsung', 'Droid Charge' ),
+			'SCH-I515'									=> array( 'Samsung', 'Galaxy Nexus' ),
+			'SCH-I535!'									=> array( 'Samsung', 'Galaxy S III' ),
+			'SCH-I605'									=> array( 'Samsung', 'Galaxy Note II' ),
+			'SCH-I619'									=> array( 'Samsung', 'SCH-I619' ),
+			'SCH-I659'									=> array( 'Samsung', 'Galaxy Ace Plus' ),
+			'SCH-I699'									=> array( 'Samsung', 'Galaxy Trend' ),
+			'SCH-I779'									=> array( 'Samsung', 'SCH-I779' ),
+			'SCH-I800'									=> array( 'Samsung', 'Galaxy Tab 7.0', TYPE_TABLET ),
+			'SCH-I815!'									=> array( 'Samsung', 'Galaxy Tab 7.7', TYPE_TABLET ),
+			'SCH-I905!'									=> array( 'Samsung', 'Galaxy Tab 10.1', TYPE_TABLET ),
+			'SCH-I909'									=> array( 'Samsung', 'Galaxy S' ),
+			'SCH-I915!'									=> array( 'Samsung', 'Galaxy Tab 2 (10.1)', TYPE_TABLET ),
+			'SCH-I925!'									=> array( 'Samsung', 'Galaxy Note 10.1', TYPE_TABLET ),
+			'SCH-I939'									=> array( 'Samsung', 'Galaxy S III' ),
+			'SCH-L710'									=> array( 'Samsung', 'Galaxy S III' ),
+			'SCH-M828!'									=> array( 'Samsung', 'Galaxy Precedent' ),
+			'SCH-N719'									=> array( 'Samsung', 'Galaxy Note II' ),
+			'SCH-P739'									=> array( 'Samsung', 'Galaxy Tab 8.9', TYPE_TABLET ),
+			'SCH-R530!'									=> array( 'Samsung', 'Galaxy S III' ),
+			'SCH-R680'									=> array( 'Samsung', 'Repp' ),
+			'SCH-R720'									=> array( 'Samsung', 'Admire' ),
+			'SCH-R730'									=> array( 'Samsung', 'Transfix' ),
+			'SCH-R760'									=> array( 'Samsung', 'Galaxy S II' ),
+			'SCH-R820'									=> array( 'Samsung', 'Admire' ),
+			'SCH-R880'									=> array( 'Samsung', 'Acclaim' ),
+			'SCH-R910'									=> array( 'Samsung', 'Galaxy Indulge 4G' ),
+			'SCH-R915'									=> array( 'Samsung', 'Galaxy Indulge' ),
+			'SCH-R920'									=> array( 'Samsung', 'Galaxy Attain 4G' ),
+			'SCH-R930'									=> array( 'Samsung', 'Galaxy S Aviator' ),
+			'SCH-R940'									=> array( 'Samsung', 'Galaxy S Lightray' ),
+			'SCH-R950'									=> array( 'Samsung', 'Galaxy Note II' ),
+			'SCH-S720C'									=> array( 'Samsung', 'Galaxy Proclaim' ),
+			'SCH-S735C'									=> array( 'Samsung', 'SCH-S735' ),
+			'SCH-S950C'									=> array( 'Samsung', 'Galaxy S Showcase' ),
+			'SCH-W799!'									=> array( 'Samsung', 'SCH-W799' ),
+			'SCH-W899'									=> array( 'Samsung', 'SCH-W899' ),
+			'SCH-W999'									=> array( 'Samsung', 'SCH-W999' ),
+			'SGH-E258'									=> array( 'Samsung', 'SGH-E258' ),
+			'SGH-I317!'									=> array( 'Samsung', 'Galaxy Note II' ),
+			'SGH-I337!'									=> array( 'Samsung', 'Galaxy S IV' ),
+			'SGH-I497'									=> array( 'Samsung', 'Galaxy Tab 2 (10.1)', TYPE_TABLET ),
+			'SGH-I547!'									=> array( 'Samsung', 'Galaxy Rugby Pro' ),
+			'SGH-I717!'									=> array( 'Samsung', 'Galaxy Note' ),
+			'SGH-I727'									=> array( 'Samsung', 'Galaxy S II Skyrocket' ),
+			'SGH-I727R'									=> array( 'Samsung', 'Galaxy S II' ),
+			'SGH-I7(47|48)!'							=> array( 'Samsung', 'Galaxy S III' ),
+			'SGH-I757!'									=> array( 'Samsung', 'Galaxy S II Skyrocket HD' ),
+			'SGH-I9?777!'								=> array( 'Samsung', 'Galaxy S II' ),
+			'SGH-I847'									=> array( 'Samsung', 'Rugby Smart' ),
+			'SGH-I8(96|97)!'							=> array( 'Samsung', 'Captivate' ),
+			'SGH-I927!'									=> array( 'Samsung', 'Captivate Glide' ),
+			'SGH-I957!'									=> array( 'Samsung', 'Galaxy Tab 8.9', TYPE_TABLET ),
+			'SGH-I987'									=> array( 'Samsung', 'Galaxy Tab 7.0', TYPE_TABLET ),
+			'SGH-I997'									=> array( 'Samsung', 'Infuse 4G' ),
+			'SGH-I997R'									=> array( 'Samsung', 'Infuse 4G' ),
+			'SGH-I9000'									=> array( 'Samsung', 'Galaxy S' ),
+			'SGH-M919'									=> array( 'Samsung', 'SGH-M919' ),
+			'SGH-S730!'									=> array( 'Samsung', 'Galaxy Discover' ),
+			'SGH-S959G'									=> array( 'Samsung', 'Galaxy S II' ),
+			'SGH-T499'									=> array( 'Samsung', 'Dart' ),
+			'SGH-T499[VY]!'								=> array( 'Samsung', 'Galaxy Mini' ),
+			'SGH-T589!'									=> array( 'Samsung', 'Gravity Smart' ),
+			'SGH-T679!'									=> array( 'Samsung', 'Exhibit II 4G' ),
+			'SGH-T699'									=> array( 'Samsung', 'S Blaze Q' ),
+			'SGH-T759'									=> array( 'Samsung', 'Exhibit 4G' ),
+			'SGH-T769'									=> array( 'Samsung', 'Galaxy S Blaze 4G' ),
+			'SGH-T779'									=> array( 'Samsung', 'Galaxy Tab 2 (10.1)', TYPE_TABLET ),
+			'SGH-T839'									=> array( 'Samsung', 'T-Mobile Sidekick' ),
+			'SGH-T849'									=> array( 'Samsung', 'Galaxy Tab 7.0', TYPE_TABLET ),
+			'SGH-T859'									=> array( 'Samsung', 'Galaxy Tab 10.1', TYPE_TABLET ),
+			'SGH-T869'									=> array( 'Samsung', 'Galaxy Tab 7.0 Plus', TYPE_TABLET ),
+			'SGH-T879'									=> array( 'Samsung', 'Galaxy Note' ),
+			'SGH-T889!'									=> array( 'Samsung', 'Galaxy Note II' ),
+			'SGH-T959'									=> array( 'Samsung', 'Vibrant' ),
+			'SGH-T959D'									=> array( 'Samsung', 'Galaxy S Fascinate 3G+' ),
+			'SGH-T959P'									=> array( 'Samsung', 'Galaxy S Fascinate 4G' ),
+			'SGH-T959V'									=> array( 'Samsung', 'Galaxy S 4G' ),
+			'SGH-T989'									=> array( 'Samsung', 'Galaxy S II' ),
+			'SGH-T989D'									=> array( 'Samsung', 'Galaxy S II X' ),
+			'SGH-T999!'									=> array( 'Samsung', 'Galaxy S Blaze 4G' ),
+			'SHV-E120!'									=> array( 'Samsung', 'Galaxy S II HD LTE' ),
+			'SHV-E110!'									=> array( 'Samsung', 'Galaxy S II LTE' ),
+			'SHV-E140!'									=> array( 'Samsung', 'Galaxy Tab 8.9', TYPE_TABLET ),
+			'SHV-E150!'									=> array( 'Samsung', 'Galaxy Tab 7.7', TYPE_TABLET ),
+			'SHV-E160!'									=> array( 'Samsung', 'Galaxy Note' ),
+			'SHV-E170!'									=> array( 'Samsung', 'Galaxy R' ),
+			'SHV-E210!'									=> array( 'Samsung', 'Galaxy S III' ),
+			'SHV-E250!'									=> array( 'Samsung', 'Galaxy Note II' ),
+			'SHV-E270!'									=> array( 'Samsung', 'Galaxy Grand' ),
+			'SHV-E300!'									=> array( 'Samsung', 'Galaxy S IV' ),
+			'SHW-M100!'									=> array( 'Samsung', 'Galaxy A' ),
+			'SHW-M110!'									=> array( 'Samsung', 'Galaxy S' ),
+			'SHW-M130L!'								=> array( 'Samsung', 'Galaxy U' ),
+			'SHW-M130K!'								=> array( 'Samsung', 'Galaxy K' ),
+			'SHW-M1(80|85)!'							=> array( 'Samsung', 'Galaxy Tab', TYPE_TABLET ),
+			'SHW-M190!'									=> array( 'Samsung', 'Galaxy S Hoppin' ),
+			'SHW-M220!'									=> array( 'Samsung', 'Galaxy Neo' ),
+			'SHW-M240!'									=> array( 'Samsung', 'Galaxy Ace' ),
+			'SHW ?-M250!'								=> array( 'Samsung', 'Galaxy S II' ),
+			'SHW-M290K'									=> array( 'Samsung', 'Galaxy Gio' ),
+			'SHW-M300!'									=> array( 'Samsung', 'Galaxy Tab 10.1', TYPE_TABLET ),
+			'SHW-M305!'									=> array( 'Samsung', 'Galaxy Tab 8.9', TYPE_TABLET ),
+			'SHW-M340!'									=> array( 'Samsung', 'Galaxy M Style' ),
+			'SHW-M380!'									=> array( 'Samsung', 'Galaxy Tab 10.1', TYPE_TABLET ),
+			'SHW-M440!'									=> array( 'Samsung', 'Galaxy S III' ),
+			'SHW-M480!'									=> array( 'Samsung', 'Galaxy Note 10.1' ),
+			'SMT-i9100'									=> array( 'Samsung', 'SMT-I9100', TYPE_TABLET ),
+			'SPH-D600'									=> array( 'Samsung', 'Conquer 4G' ),
+			'SPH-D700'									=> array( 'Samsung', 'Epic 4G' ),
+			'SPH-D705'									=> array( 'Samsung', 'Epic 4G 2' ),
+			'SPH-D710!'									=> array( 'Samsung', 'Epic 4G Touch' ),
+			'SPH-L300'									=> array( 'Samsung', 'Galaxy Victory 4G LTE' ),
+			'SPH-L700'									=> array( 'Samsung', 'Galaxy Nexus' ),
+			'SPH-L710'									=> array( 'Samsung', 'Galaxy S III' ),
+			'SPH-L900'									=> array( 'Samsung', 'Galaxy Note II' ),
+			'SPH-M820!'									=> array( 'Samsung', 'Galaxy Prevail' ),
+			'SPH-M830'									=> array( 'Samsung', 'Galaxy Rush' ),
+			'SPH-M580'									=> array( 'Samsung', 'Replenish' ),
+			'SPH-M900'									=> array( 'Samsung', 'Moment' ),
+			'SPH-M910'									=> array( 'Samsung', 'Intercept' ),
+			'SPH-M920'									=> array( 'Samsung', 'Transform' ),
+			'SPH-M930!'									=> array( 'Samsung', 'Transform Ultra' ),
+			'SPH-M950'									=> array( 'Samsung', 'Galaxy Reverb' ),
+			'SPH-P100'									=> array( 'Samsung', 'Galaxy Tab', TYPE_TABLET ),
+			'YP-GB1'									=> array( 'Samsung', 'Galaxy Player', 'media' ),
+			'YP-GB70'									=> array( 'Samsung', 'Galaxy Player 70', 'media' ),
+			'YP-GB70D'									=> array( 'Samsung', 'Galaxy Player 70 Plus', 'media' ),
+			'YP-GS1'									=> array( 'Samsung', 'Galaxy S WiFi 3.6', 'media' ),
+			'YP-G1'										=> array( 'Samsung', 'Galaxy S WiFi 4.0', 'media' ),
+			'YP-GI1'									=> array( 'Samsung', 'Galaxy S WiFi 4.2', 'media' ),
+			'YP-G50'									=> array( 'Samsung', 'Galaxy Player', 'media' ),
+			'YP-G70'									=> array( 'Samsung', 'Galaxy S WiFi 5.0', 'media' ),
+			'GT9100'									=> array( 'Samsung', 'Galaxy S II' ),
+			'I897'										=> array( 'Samsung', 'Captivate' ),
+			'I7500'										=> array( 'Samsung', 'Galaxy' ),
+			'I9000'										=> array( 'Samsung', 'Galaxy S' ),
+			'T959'										=> array( 'Samsung', 'Galaxy S Vibrant' ),
+			'Captivate-I897'							=> array( 'Samsung', 'Captivate' ),
+			'Galaxy'									=> array( 'Samsung', 'Galaxy' ),
+			'Galaxy Note'								=> array( 'Samsung', 'Galaxy Note' ),
+			'GalaxyS'									=> array( 'Samsung', 'Galaxy S' ),
+			'Galaxy S II'								=> array( 'Samsung', 'Galaxy S II' ),
+			'Galaxy X'									=> array( 'Samsung', 'Galaxy X' ),
+			'Galaxy Spica'								=> array( 'Samsung', 'Galaxy Spica' ),
+			'GALAXY Tab'								=> array( 'Samsung', 'Galaxy Tab', TYPE_TABLET ),
+			'Vibrantmtd'								=> array( 'Samsung', 'Vibrant' ),
+			'Vibrant T959'								=> array( 'Samsung', 'Vibrant' ),
+			'SC-01C'									=> array( 'Samsung', 'Galaxy Tab', TYPE_TABLET ),
+			'SC-01D'									=> array( 'Samsung', 'Galaxy Tab 10.1 LTE', TYPE_TABLET ),
+			'SC-01E'									=> array( 'Samsung', 'Galaxy Tab 7.7 Plus', TYPE_TABLET ),
+			'SC-02B'									=> array( 'Samsung', 'Galaxy S' ),
+			'SC-02C'									=> array( 'Samsung', 'Galaxy S II' ),
+			'SC-02D'									=> array( 'Samsung', 'Galaxy Tab 7.0 Plus', TYPE_TABLET ),
+			'SC-02E'									=> array( 'Samsung', 'Galaxy Note II' ),
+			'SC-03D'									=> array( 'Samsung', 'Galaxy S II LTE' ),
+			'SC-03E'									=> array( 'Samsung', 'Galaxy S III α' ),
+			'SC-04D'									=> array( 'Samsung', 'Galaxy Nexus' ),
+			'SC-05D'									=> array( 'Samsung', 'Galaxy Note LTE' ),
+			'SC-06D'									=> array( 'Samsung', 'Galaxy S III' ),
+			'ISW11SC'									=> array( 'Samsung', 'Galaxy S II WiMAX' ),
+			'A01SH'										=> array( 'Sharp', 'A01SH' ),
+			'IS01'										=> array( 'Sharp', 'IS01' ),
+			'IS03'										=> array( 'Sharp', 'IS03' ),
+			'IS05'										=> array( 'Sharp', 'IS05' ),
+			'IS11SH'									=> array( 'Sharp', 'Aquos IS11SH' ),
+			'IS12SH'									=> array( 'Sharp', 'Aquos IS12SH' ),
+			'IS13SH'									=> array( 'Sharp', 'Aquos IS13SH' ),
+			'IS14SH'									=> array( 'Sharp', 'Aquos IS14SH' ),
+			'ISW16SH'									=> array( 'Sharp', 'Aquos ISW16SH' ),
+			'EB-W51GJ'									=> array( 'Sharp', 'EB-W51GJ' ),
+			'SBM003SH'									=> array( 'Sharp', 'Galapagos' ),
+			'SBM005SH'									=> array( 'Sharp', 'Galapagos' ),
+			'SBM006SH'									=> array( 'Sharp', 'Aquos' ),
+			'SBM007SH'									=> array( 'Sharp', 'Aquos 007SH' ),
+			'SBM009SH'									=> array( 'Sharp', 'Aquos 009SH' ),
+			'SBM009SHY'									=> array( 'Sharp', 'Yahoo! Phone' ),
+			'SBM102SH'									=> array( 'Sharp', 'Aquos 102SH' ),
+			'SBM103SH'									=> array( 'Sharp', 'Aquos 103SH' ),
+			'SBM104SH'									=> array( 'Sharp', 'Aquos 104SH' ),
+			'SBM106SH'									=> array( 'Sharp', 'Aquos 106SH' ),
+			'SBM107SH'									=> array( 'Sharp', 'Aquos 107SH' ),
+			'SBM107SHB'									=> array( 'Sharp', 'Aquos 107SH' ),
+			'SBM200SH'									=> array( 'Sharp', 'PANTONE 6 200SH' ),
+			'SH-01D'									=> array( 'Sharp', 'Aquos SH-01D' ),
+			'SH-01E'									=> array( 'Sharp', 'Aquos si SH-01E' ),
+			'SH-02D'									=> array( 'Sharp', 'Aquos slider SH-02D' ),
+			'SH-02E'									=> array( 'Sharp', 'Aquos Zeta SH-02E' ),
+			'SH-03C'									=> array( 'Sharp', 'Lynx 3D' ),
+			'SH-04E'									=> array( 'Sharp', 'Aquos EX SH-04E' ),
+			'SH-06D'									=> array( 'Sharp', 'Aquos SH-06D' ),
+			'SH-06DNERV'								=> array( 'Sharp', 'NERV SH-06D' ),
+			'SH-07D'									=> array( 'Sharp', 'Aquos st SH-07D' ),
+			'SH-09D'									=> array( 'Sharp', 'Aquos Zeta SH-09D' ),
+			'SH-10B'									=> array( 'Sharp', 'Lynx' ),
+			'SH-10D'									=> array( 'Sharp', 'Aquos sv SH-10D' ),
+			'SH-12C'									=> array( 'Sharp', 'Aquos' ),
+			'SH-13C'									=> array( 'Sharp', 'Aquos f SH-13C' ),
+			'SH80F'										=> array( 'Sharp', 'Aquos SH80F' ),
+			'SH530U'									=> array( 'Sharp', 'SH530U' ),
+			'SH-631M'									=> array( 'Sharp', 'SH631M' ),
+			'SH72x8U'									=> array( 'Sharp', 'SH72x8U' ),
+			'SH8118U'									=> array( 'Sharp', 'SH8118U' ),
+			'SH8128U'									=> array( 'Sharp', 'SH8128U' ),
+			'SH8158U'									=> array( 'Sharp', 'SH8158U' ),
+			'SH8188U'									=> array( 'Sharp', 'SH8188U' ),
+			'SH8268U'									=> array( 'Sharp', 'SH8268U' ),
+			'INFOBAR C01'								=> array( 'Sharp', 'INFOBAR C01' ),
+			'SPX-5'										=> array( 'Simvalley', 'SPX-5' ),
+			'SPX-5 3G'									=> array( 'Simvalley', 'SPX-5 3G' ),
+			'SmartQ G7'									=> array( 'SmartQ', 'G7', TYPE_TABLET ),
+			'SmartQT7'									=> array( 'SmartQ', 'T7', TYPE_TABLET ),
+			'SmartQT10'									=> array( 'SmartQ', 'T10', TYPE_TABLET ),
+			'SmartQT15'									=> array( 'SmartQ', 'T15', TYPE_TABLET ),
+			'SmartQT19'									=> array( 'SmartQ', 'T19', TYPE_TABLET ),
+			'SmartQT20'									=> array( 'SmartQ', 'T20', TYPE_TABLET ),
+			'OMS1 6'									=> array( 'Sony Ericsson', 'A8i' ),
+			'C15(04|05)!'								=> array( 'Sony', 'Xperia E' ),
+			'C16(04|05)!'								=> array( 'Sony', 'Xperia E dual' ),
+			'C21(04|05)!'								=> array( 'Sony', 'Xperia "Gaga"' ),
+			'C3602'										=> array( 'Sony', 'Xperia "Togari"' ),
+			'C430[0-9]!'								=> array( 'Sony', 'C430X' ),
+			'C5303'										=> array( 'Sony', 'Xperia "HuaShan"' ),
+			'C550[0-9]!'								=> array( 'Sony', 'Xperia "Dogo"' ),
+			'C65(02|03|06)!'							=> array( 'Sony', 'Xperia ZL' ),
+			'C6603'										=> array( 'Sony', 'Xperia Z' ),
+			'E10(a|i|iv)!'								=> array( 'Sony Ericsson', 'Xperia X10 Mini' ),
+			'E15(a|i|iv|i-o)?$!'						=> array( 'Sony Ericsson', 'Xperia X8' ),
+			'E16i!'										=> array( 'Sony Ericsson', 'W8 Walkman' ),
+			'LT11i!'									=> array( 'Sony Ericsson', 'Xperia Neo V' ),
+			'LT15(a|i|iv|i-o)?$!'						=> array( 'Sony Ericsson', 'Xperia Arc' ),
+			'LT15i Speed Edition'						=> array( 'Sony Ericsson', 'Xperia Arc' ),
+			'LT18(a|i|iv|i-o)?$!'						=> array( 'Sony Ericsson', 'Xperia Arc S' ),
+			'LT22i!'									=> array( 'Sony', 'Xperia P' ),
+			'LT25i!'									=> array( 'Sony', 'Xperia V' ),
+			'LT25c!'									=> array( 'Sony', 'Xperia VC' ),
+			'LT26(i|i-o)!'								=> array( 'Sony', 'Xperia S' ),
+			'LT26ii!'									=> array( 'Sony', 'Xperia SL' ),
+			'LT26w!'									=> array( 'Sony', 'Xperia Acro S' ),
+			'LT28(at|h|i)!'								=> array( 'Sony', 'Xperia Ion' ),
+			'LT29i!'									=> array( 'Sony', 'Xperia TX' ),
+			'LT30(at)!'									=> array( 'Sony', 'Xperia TL' ),
+			'LT30(a|p)!'								=> array( 'Sony', 'Xperia T' ),
+			'MK16(a|i)!'								=> array( 'Sony Ericsson', 'Xperia Pro' ),
+			'MT11(a|i|iv|i-o)!'							=> array( 'Sony Ericsson', 'Xperia Neo V' ),
+			'MT15(a|i|iv|i-o)!'							=> array( 'Sony Ericsson', 'Xperia Neo' ),
+			'MT25i!'									=> array( 'Sony', 'Xperia Neo L' ),
+			'MT27i!'									=> array( 'Sony', 'Xperia Sola' ),
+			'R800(a|at|i|iv|x)!'						=> array( 'Sony Ericsson', 'Xperia Play' ),
+			'SK17(a|i|iv|i-o)!'							=> array( 'Sony Ericsson', 'Xperia Mini Pro' ),
+			'ST15(a|i)!'								=> array( 'Sony Ericsson', 'Xperia Mini' ),
+			'ST17(a|i)!'								=> array( 'Sony Ericsson', 'Xperia Active' ),
+			'ST18(a|av|i|iv)!'							=> array( 'Sony Ericsson', 'Xperia Ray' ),
+			'ST21(a|i)?$!'								=> array( 'Sony', 'Xperia Tipo' ),
+			'ST21(a2|i2)!'								=> array( 'Sony', 'Xperia Tipo Dual' ),
+			'ST23(a|i)!'								=> array( 'Sony', 'Xperia Miro' ),
+			'ST25(a|i)!'								=> array( 'Sony', 'Xperia U' ),
+			'ST26(a|i)?!'								=> array( 'Sony', 'Xperia J' ),
+			'ST27(a|i)!'								=> array( 'Sony', 'Xperia Go' ),
+			'U20(a|i|iv)!'								=> array( 'Sony Ericsson', 'Xperia X10 Mini Pro' ),
+			'WT13i!'									=> array( 'Sony Ericsson', 'Mix Walkman' ),
+			'WT18i!'									=> array( 'Sony Ericsson', 'Walkman' ),
+			'WT19(a|i|iv)!'								=> array( 'Sony Ericsson', 'Live with Walkman' ),
+			'X8'										=> array( 'Sony Ericsson', 'Xperia X8' ),
+			'X10(a|i|iv|s)?$!'							=> array( 'Sony Ericsson', 'Xperia X10' ),
+			'X10 ?(Mini|Mini Pro)$!'					=> array( 'Sony Ericsson', 'Xperia X10 Mini Pro' ),
+			'Z1i'										=> array( 'Sony Ericsson', 'Xperia Play' ),
+			'S51SE'										=> array( 'Sony Ericsson', 'Xperia Mini' ),
+			'IS11S'										=> array( 'Sony Ericsson', 'Xperia Acro' ),
+			'IS12S'										=> array( 'Sony Ericsson', 'Xperia Acro HD' ),
+			'SO-01B'									=> array( 'Sony Ericsson', 'Xperia X10' ),
+			'SO-01C'									=> array( 'Sony Ericsson', 'Xperia Arc' ),
+			'SO-01D'									=> array( 'Sony Ericsson', 'Xperia Play' ),
+			'SO-01E'									=> array( 'Sony', 'Xperia AX' ),
+			'SO-02C'									=> array( 'Sony Ericsson', 'Xperia Acro' ),
+			'SO-02D'									=> array( 'Sony Ericsson', 'Xperia NX' ),
+			'SO-02E'									=> array( 'Sony', 'Xperia Z' ),
+			'SO-03C'									=> array( 'Sony Ericsson', 'Xperia Ray' ),
+			'SO-03D'									=> array( 'Sony Ericsson', 'Xperia Acro HD' ),
+			'SO-03E'									=> array( 'Sony', 'Xperia "Honami"' ),
+			'SO-04D'									=> array( 'Sony', 'Xperia GX' ),
+			'SO-05D'									=> array( 'Sony', 'Xperia SX' ),
+			'SOL21'										=> array( 'Sony', 'Xperia VL' ),
+			'Xperia X1'									=> array( 'Sony Ericsson', 'Xperia X1' ),
+			'Xperia X8'									=> array( 'Sony Ericsson', 'Xperia X8' ),
+			'Xperia X10'								=> array( 'Sony Ericsson', 'Xperia X10' ),
+			'Xperia Ray'								=> array( 'Sony Ericsson', 'Xperia Ray' ),
+			'Xperia Acro S'								=> array( 'Sony', 'Xperia Acro S' ),
+			'Xperia Arc'								=> array( 'Sony Ericsson', 'Xperia Arc' ),
+			'Xperia Arc S'								=> array( 'Sony Ericsson', 'Xperia Arc S' ),
+			'Xperia ion'								=> array( 'Sony', 'Xperia Ion' ),
+			'Xperia Mini'								=> array( 'Sony Ericsson', 'Xperia Mini' ),
+			'Xperia Mini Pro'							=> array( 'Sony Ericsson', 'Xperia Mini Pro' ),
+			'Xperia Neo'								=> array( 'Sony Ericsson', 'Xperia Neo' ),
+			'Xperia NeoV'								=> array( 'Sony Ericsson', 'Xperia Neo V' ),
+			'Xperia Neo V'								=> array( 'Sony Ericsson', 'Xperia Neo V' ),
+			'Xperia Play'								=> array( 'Sony Ericsson', 'Xperia Play' ),
+			'Xperia Pro'								=> array( 'Sony Ericsson', 'Xperia Pro' ),
+			'Xperia S'									=> array( 'Sony', 'Xperia S' ),
+			'Xperia Sola'								=> array( 'Sony', 'Xperia Sola' ),
+			'Xperia Tipo'								=> array( 'Sony', 'Xperia Tipo' ),
+			'Xperia Live with Walkman'					=> array( 'Sony Ericsson', 'Live with Walkman' ),
+			'Live ?With ?Walkman!'						=> array( 'Sony Ericsson', 'Live with Walkman' ),
+			'Hayabusa'									=> array( 'Sony', 'Xperia Ion' ),
+			'Nozomi'									=> array( 'Sony', 'Xperia S' ),
+			'Tablet P'									=> array( 'Sony', 'Tablet P', TYPE_TABLET ),
+			'Tablet S'									=> array( 'Sony', 'Tablet S', TYPE_TABLET ),
+			'SGPT12'									=> array( 'Sony', 'Tablet S', TYPE_TABLET ),
+			'NWZ?-Z1000Series!'							=> array( 'Sony', 'Walkman Z', TYPE_MEDIA ),
+			'NSZ-GP9'									=> array( 'Sony', 'NSZ-GP9', TYPE_TELEVISION, FLAG_GOOGLETV ),
+			'NSZ-GS7'									=> array( 'Sony', 'NSZ-GS7', TYPE_TELEVISION, FLAG_GOOGLETV ),
+			'NSZ-GT1'									=> array( 'Sony', 'NSZ-GT1', TYPE_TELEVISION, FLAG_GOOGLETV ),
+			'Spice Mi280'								=> array( 'Spice', 'Mi-280' ),
+			'Spice Mi300'								=> array( 'Spice', 'Mi-300' ),
+			'Spice Mi-310'								=> array( 'Spice', 'Mi-310' ),
+			'Spice Mi-355'								=> array( 'Spice', 'Mi-355' ),
+			'Spice Mi-425'								=> array( 'Spice', 'Mi-425' ),
+			'Spice Mi-500'								=> array( 'Spice', 'Mi-500' ),
+			'SPICE Mi-720'								=> array( 'Spice', 'Mi-720' ),
+			'A7272+'									=> array( 'Star', 'A7272+' ),
+			'e1109 v73 gq1002 ctp'						=> array( 'Star', 'X18i' ),
+			'Cyclone Voyager'							=> array( 'Sumvision', 'Cyclone Voyager', TYPE_TABLET ),
+			'M1001'										=> array( 'Superpad', 'M1001', TYPE_TABLET ),
+			'TS1004T'									=> array( 'Surf 3Q', 'TS1004T', TYPE_TABLET ),
+			'SYTABEX7-2'								=> array( 'Sylvania', 'SYTABEX7', TYPE_TABLET ),
+			'KM-S200'									=> array( 'TAKE', 'Janus KM-S200' ),
+			'TCL A860'									=> array( 'TCL', 'A860' ),
+			'TCL A906'									=> array( 'TCL', 'A906' ),
+			'TCL A909'									=> array( 'TCL', 'A909' ),
+			'TCL A919'									=> array( 'TCL', 'A919' ),
+			'TCL A966'									=> array( 'TCL', 'A966' ),
+			'TCL A968'									=> array( 'TCL', 'A968' ),
+			'TCL A990'									=> array( 'TCL', 'A990' ),
+			'TCL A996'									=> array( 'TCL', 'A996' ),
+			'TCL A998'									=> array( 'TCL', 'A998' ),
+			'TCL C990+'									=> array( 'TCL', 'C990+' ),
+			'TCL GENESEE E708'							=> array( 'TCL', 'Genesee E708' ),
+			'TCL S500'									=> array( 'TCL', 'S500' ),
+			'(TCL )?S600!'								=> array( 'TCL', 'S600' ),
+			'TCL S830'									=> array( 'TCL', 'S830' ),
+			'TCL S900'									=> array( 'TCL', 'S900' ),
+			'TCL W939'									=> array( 'TCL', 'W939' ),
+			'TCL Y710'									=> array( 'TCL', 'Y710' ),
+			'A10t(5DM3)'								=> array( 'Teclast', 'A10T', TYPE_TABLET ),
+			'P72'										=> array( 'Teclast', 'P72', TYPE_TABLET ),
+			'P76TI'										=> array( 'Teclast', 'P76Ti', TYPE_TABLET ),
+			'P81HD'										=> array( 'Teclast', 'P81HD', TYPE_TABLET ),
+			'P85(R8A1)'									=> array( 'Teclast', 'P85', TYPE_TABLET ),
+			'Teclast P85'								=> array( 'Teclast', 'P85', TYPE_TABLET ),
+			'T720 SE'									=> array( 'Teclast', 'T720', TYPE_TABLET ),
+			'T760 from moage.com'						=> array( 'Teclast', 'T760', TYPE_TABLET ),
+			'tegav2'									=> array( 'Tegatech', 'TEGA v2', TYPE_TABLET ),
+			'TM-7025'									=> array( 'teXet', 'TM-7025', TYPE_TABLET ),
+			'MoFing'									=> array( 'Thomson', 'MoFing', TYPE_TABLET ),
+			'Ultimate10'								=> array( 'Tomtec', 'Ultimate10', TYPE_TABLET ),
+			'ThL V7'									=> array( 'THL', 'V7' ),
+			'ThL V8'									=> array( 'THL', 'V8' ),
+			'ThL V9'									=> array( 'THL', 'V9' ),
+			'ThL V11'									=> array( 'THL', 'V11' ),
+			'ThL V12'									=> array( 'THL', 'V12' ),
+			'ThL W1'									=> array( 'THL', 'W1' ),
+			'ThL W3'									=> array( 'THL', 'W3' ),
+			'TSB CLOUD COMPANION;TOSHIBA AC AND AZ'		=> array( 'Toshiba', 'Dynabook AZ', 'desktop' ),
+			'TOSHIBA AC AND AZ'							=> array( 'Toshiba', 'Dynabook AZ', 'desktop' ),
+			'TOSHIBA FOLIO AND A'						=> array( 'Toshiba', 'Folio 100', TYPE_TABLET ),
+			'T-01C'										=> array( 'Toshiba', 'Regza T-01C' ),
+			'T-01D'										=> array( 'Toshiba', 'Regza T-01D' ),
+			'T-02D'										=> array( 'Toshiba', 'Regza T-02D' ),
+			'IS04'										=> array( 'Toshiba', 'Regza IS04' ),
+			'IS11T'										=> array( 'Toshiba', 'Regza IS11T' ),
+			'AT1S0'										=> array( 'Toshiba', 'Regza AT1S0' ),
+			'Tostab03'									=> array( 'Toshiba', 'Regza AT100', TYPE_TABLET ),
+			'AT100'										=> array( 'Toshiba', 'Regza AT100', TYPE_TABLET ),
+			'AT200'										=> array( 'Toshiba', 'Regza AT200', TYPE_TABLET ),
+			'AT300'										=> array( 'Toshiba', 'Regza AT300', TYPE_TABLET ),
+			'AT470'										=> array( 'Toshiba', 'Regza AT470', TYPE_TABLET ),
+			'AT500'										=> array( 'Toshiba', 'Regza AT500', TYPE_TABLET ),
+			'AT570'										=> array( 'Toshiba', 'Regza AT570', TYPE_TABLET ),
+			'AT830'										=> array( 'Toshiba', 'Regza AT830', TYPE_TABLET ),
+			'Folio 100'									=> array( 'Toshiba', 'Folio 100', TYPE_TABLET ),
+			'folio100'									=> array( 'Toshiba', 'Folio 100', TYPE_TABLET ),
+			'THRiVE'									=> array( 'Toshiba', 'THRiVE', TYPE_TABLET ),
+			'Fantastic T3'								=> array( 'TWM', 'Fantastic T3' ),
+			'TB100'										=> array( 'Unitech', 'TB100', TYPE_TABLET ),
+			'M70014'									=> array( 'United Star Technology', 'M70014', TYPE_TABLET ),
+			'UMI X1'									=> array( 'UMI', 'X1' ),
+			'PS47'										=> array( 'Velocity Micro', 'Cruz PS47', TYPE_TABLET ),
+			'T301'										=> array( 'Velocity Micro', 'Cruz T301', TYPE_TABLET ),
+			'Vibo-A688'									=> array( 'FIH', 'Vibo A688' ),
+			'Videocon-V7500'							=> array( 'Videocon', 'V7500' ),
+			'GTablet'									=> array( 'ViewSonic', 'gTablet', TYPE_TABLET ),
+			'GtabComb'									=> array( 'ViewSonic', 'gTablet', TYPE_TABLET ),
+			'TeamDRH ICS for GTablet'					=> array( 'ViewSonic', 'gTablet', TYPE_TABLET ),
+			'ViewPad7'									=> array( 'ViewSonic', 'ViewPad 7', TYPE_TABLET ),
+			'ViewPad 10e'								=> array( 'ViewSonic', 'ViewPad 10e', TYPE_TABLET ),
+			'VINUS V8'									=> array( 'Vinus', 'V8' ),
+			'vivo E1'									=> array( 'Vivo', 'E1' ),
+			'vivo S7'									=> array( 'Vivo', 'S7' ),
+			'vivo V2'									=> array( 'Vivo', 'V2' ),
+			'vivo X1'									=> array( 'Vivo', 'X1' ),
+			'VTAB1008'									=> array( 'Vizio', 'VTAB1008', TYPE_TABLET ),
+			'VTAB3010'									=> array( 'Vizio', 'VTAB3010', TYPE_TABLET ),
+			'VOTO W5300'								=> array( 'VOTO', 'W5300' ),
+			'Vsun i9'									=> array( 'Vsun Mobile', 'i9' ),
+			'xPAD-70'									=> array( 'WayteQ', 'xPAD-70', TYPE_TABLET ),
+			'xTAB-70'									=> array( 'WayteQ', 'xTAB-70', TYPE_TABLET ),
+			'WellcoM-A99'								=> array( 'WellcoM', 'A99' ),
+			'WIKO-CINK SLIM'							=> array( 'Wiko', 'Cink Slim' ),
+			'N5PRO2jingying'							=> array( 'Window', 'N5 Pro 2', TYPE_MEDIA ),
+			'N12'										=> array( 'Window', 'N12', TYPE_TABLET ),
+			'N12R'										=> array( 'Window', 'N12R', TYPE_TABLET ),
+			'N50'										=> array( 'Window', 'N50', TYPE_TABLET ),
+			'N50DT'										=> array( 'Window', 'N50DT', TYPE_TABLET ),
+			'N50GT'										=> array( 'Window', 'N50GT', TYPE_TABLET ),
+			'N50GT A'									=> array( 'Window', 'N50GT-A', TYPE_TABLET ),
+			'N70'										=> array( 'Window', 'N70', TYPE_TABLET ),
+			'N70-S'										=> array( 'Window', 'N70S', TYPE_TABLET ),
+			'N70HD'										=> array( 'Window', 'N70HD', TYPE_TABLET ),
+			'N70 DUAL CORE'								=> array( 'Window', 'N70 Dual Core', TYPE_TABLET ),
+			'N70DC-T'									=> array( 'Window', 'N70 Dual Core', TYPE_TABLET ),
+			'N80($| from moage.com)!'					=> array( 'Window', 'N80', TYPE_TABLET ),
+			'N80DC'										=> array( 'Window', 'N80 Dual Core', TYPE_TABLET ),
+			'N90'										=> array( 'Window', 'N90', TYPE_TABLET ),
+			'N90 DUAL CORE!'							=> array( 'Window', 'N90 Dual Core', TYPE_TABLET ),
+			'N101 DUAL CORE!'							=> array( 'Window', 'N101 Dual Core', TYPE_TABLET ),
+			'N612'										=> array( 'Wishway', 'N612' ),
+			'AT-AS43D'									=> array( 'Wolfgang', 'AT-AS43D' ),
+			'M12'										=> array( 'Wopad', 'M12', TYPE_TABLET ),
+			'WM8650'									=> array( 'WonderMedia', 'WM8650', TYPE_TABLET ),
+			'WM8850-mid'								=> array( 'WonderMedia', 'WM8850', TYPE_TABLET ),
+			'MI-ONE'									=> array( 'Xiaomi', 'MI-ONE' ),
+			'MI 1S'										=> array( 'Xiaomi', 'MI-ONE S' ),
+			'MI 1SC'									=> array( 'Xiaomi', 'MI-ONE SC' ),
+			'MI-ONE C1'									=> array( 'Xiaomi', 'MI-ONE C1' ),
+			'MI-ONE Plus'								=> array( 'Xiaomi', 'MI-ONE Plus' ),
+			'mione plus'								=> array( 'Xiaomi', 'MI-ONE Plus' ),
+			'MI 2'										=> array( 'Xiaomi', 'MI-TWO' ),
+			'MI-TWO'									=> array( 'Xiaomi', 'MI-TWO' ),
+			'Q07CL01'									=> array( 'XVision', 'Q07', TYPE_TABLET ),
+			'N6'										=> array( 'Yarvik', 'TAB210 Tablet', TYPE_TABLET ),
+			'TAB224'									=> array( 'Yarvik', 'TAB224 GoTab Velocity', TYPE_TABLET ),
+			'C868'										=> array( 'Yicheer', 'C868' ),
+			'EMR1879'									=> array( 'Yidong', 'EMR1879', TYPE_TABLET ),
+			'yusun W702'								=> array( 'Yusun', 'W702' ),
+			'YX-YUSUN E80'								=> array( 'Yusun', 'E80' ),
+			'TB782B'									=> array( 'Zeki', 'TB782B', TYPE_TABLET ),
+			'p7901a'									=> array( 'Zenithink', 'Epad P7901A', TYPE_TABLET ),
+			'zt180'										=> array( 'Zenithink', 'ZT-180', TYPE_TABLET ),
+			'Jaguar7'									=> array( 'ZiiLabs', 'Jaguar 7', TYPE_TABLET ),
+			'Ziss Ranger HD'							=> array( 'Ziss', 'Ranger HD' ),
+			'ZTE Libra'									=> array( 'ZTE', 'Libra' ),
+			'ZTE T T9'									=> array( 'ZTE', 'Light Tab T9', TYPE_TABLET ),
+			'V9'										=> array( 'ZTE', 'Light Tab V9', TYPE_TABLET ),
+			'V9e+'										=> array( 'ZTE', 'Light Tab 2', TYPE_TABLET ),
+			'V9A'										=> array( 'ZTE', 'Light Tab 2', TYPE_TABLET ),
+			'Light Tab 2W'								=> array( 'ZTE', 'Light Tab 2', TYPE_TABLET ),
+			'Light Tab 2'								=> array( 'ZTE', 'Light Tab 2', TYPE_TABLET ),
+			'V9C'										=> array( 'ZTE', 'Light Tab 3', TYPE_TABLET ),
+			'V55'										=> array( 'ZTE', 'Optik', TYPE_TABLET ),
+			'Acqua'										=> array( 'ZTE', 'Acqua' ),
+			'ZTE Blade'									=> array( 'ZTE', 'Blade' ),
+			'a5'										=> array( 'ZTE', 'Blade' ),
+			'Blade S'									=> array( 'ZTE', 'Blade S' ),
+			'Crescent'									=> array( 'ZTE', 'Blade S' ),			
+			'Skate'										=> array( 'ZTE', 'Skate' ),
+			'ZTE Skate'									=> array( 'ZTE', 'Skate' ),
+			'Skate Pro'									=> array( 'ZTE', 'Skate Pro' ),
+			'X500'										=> array( 'ZTE', 'X500 Score' ),
+			'ZTE X500'									=> array( 'ZTE', 'X500 Score' ),
+			'ZTE C X500'								=> array( 'ZTE', 'X500 Score' ),
+			'ZTE C N600!'								=> array( 'ZTE', 'N600' ),
+			'ZTE C N606'								=> array( 'ZTE', 'N606' ),
+			'ZTE C N700'								=> array( 'ZTE', 'N700' ),
+			'ZTE U N720'								=> array( 'ZTE', 'N720' ),
+			'ZTE C R750'								=> array( 'ZTE', 'R750' ),
+			'ZTE C N760'								=> array( 'ZTE', 'N760' ),
+			'N762'										=> array( 'ZTE', 'N762' ),
+			'ZTE V768'									=> array( 'ZTE', 'V768 Concord' ),
+			'ZTE N788'									=> array( 'ZTE', 'N788' ),
+			'ZTE V788!'									=> array( 'ZTE', 'V788 Kis' ),
+			'ZTE U788!'									=> array( 'ZTE', 'U788 Kis' ),
+			'ZTE U790'									=> array( 'ZTE', 'U790' ),
+			'ZTE U795'									=> array( 'ZTE', 'U795' ),
+			'ZTE T U802'								=> array( 'ZTE', 'U802' ),
+			'RacerII'									=> array( 'ZTE', 'U806 Racer II' ),
+			'ZTE T U806'								=> array( 'ZTE', 'U806 Racer II' ),
+			'E810'										=> array( 'ZTE', 'E810' ),
+			'ZTE T U812'								=> array( 'ZTE', 'U812' ),
+			'ZTE GV821'									=> array( 'ZTE', 'V821' ),
+			'ZTE T U830'								=> array( 'ZTE', 'U830' ),		
+			'ZTE Racer'									=> array( 'ZTE', 'X850 Racer' ),
+			'MTC 916'									=> array( 'ZTE', 'X850 Racer' ),
+			'Racer'										=> array( 'ZTE', 'X850 Racer' ),
+			'ZTE U X850'								=> array( 'ZTE', 'X850 Racer' ),
+			'ZTE U V852'								=> array( 'ZTE', 'V852 Dreamer' ),
+			'ZTE N855D'									=> array( 'ZTE', 'N855D' ),
+			'ZTE U V856'								=> array( 'ZTE', 'V856 Mimosa Mini' ),
+			'ZTE V856'									=> array( 'ZTE', 'V856 Mimosa Mini' ),
+			'ZTE U V857'								=> array( 'ZTE', 'V857' ),
+			'N860'										=> array( 'ZTE', 'N860 Warp' ),
+			'N861'										=> array( 'ZTE', 'N861 Warp II' ),
+			'ZTE U? X876!'								=> array( 'ZTE', 'X876 Raise' ),
+			'ZTE V877!'									=> array( 'ZTE', 'V877' ),
+			'N880'										=> array( 'ZTE', 'N880 Blade' ),
+			'ZTE C N880!'								=> array( 'ZTE', 'N880 Blade' ),
+			'U880'										=> array( 'ZTE', 'U880 Blade' ),
+			'ZTE ?U880!'								=> array( 'ZTE', 'U880 Blade' ),
+			'ZTE T ?U880!'								=> array( 'ZTE', 'U880 Blade' ),
+			'V880'										=> array( 'ZTE', 'V880 Blade' ),
+			'ZTE (U )?V880!'							=> array( 'ZTE', 'V880 Blade' ),
+			'ZTE U(V)880+'								=> array( 'ZTE', 'V880 Blade' ),
+			'Blade(-V880|-opda)?$!'						=> array( 'ZTE', 'V880 Blade' ),
+			'ZTE N880E'									=> array( 'ZTE', 'N880E' ),
+			'ZTE N880F'									=> array( 'ZTE', 'N880F' ),
+			'ZTE N881E'									=> array( 'ZTE', 'N881E' ),
+			'BLADEII'									=> array( 'ZTE', 'V881 Blade II' ),
+			'Blade2'									=> array( 'ZTE', 'V881 Blade II' ),
+			'ZTE U V881'								=> array( 'ZTE', 'V881 Blade II' ),		
+			'ZTE N882E'									=> array( 'ZTE', 'N882E' ),
+			'ZTE ?U885!'								=> array( 'ZTE', 'U885' ),
+			'ZTE V887'									=> array( 'ZTE', 'V887' ),
+			'ZTE V889!'									=> array( 'ZTE', 'V889' ),
+			'ZTE Blade III'								=> array( 'ZTE', 'V889M Blade III' ),			
+			'ZTE T ?U900!'								=> array( 'ZTE', 'U900' ),	
+			'ZTE N910'									=> array( 'ZTE', 'N910 Anthem' ),
+			'ZTE C X920'								=> array( 'ZTE', 'X920' ),
+			'ZXY-ZTE-C X920'							=> array( 'ZTE', 'X920' ),
+			'ZTE U930'									=> array( 'ZTE', 'U930 Grand X' ),
+			'ZTE Grand X'								=> array( 'ZTE', 'U930 Grand X' ),
+			'Grand X In'								=> array( 'ZTE', 'U930 Grand X' ),
+			'ZTE U930 Ultimate'							=> array( 'ZTE', 'U930 Grand X' ),
+			'ZTE U950'									=> array( 'ZTE', 'U950' ),
+			'ZTE V955'									=> array( 'ZTE', 'V955' ),
+			'ZTE (U )?V960!'							=> array( 'ZTE', 'V960 Skate' ),
+			'ZTE T ?U960!'								=> array( 'ZTE', 'U960 Skate' ),
+			'ZTE U960s2'								=> array( 'ZTE', 'U960s2' ),
+			'ZTE U960s3'								=> array( 'ZTE', 'U960s3' ),
+			'ZTE N970'									=> array( 'ZTE', 'N970 Grand X' ),
+			'ZTE U970'									=> array( 'ZTE', 'U970 Grand X' ),
+			'ZTE V970'									=> array( 'ZTE', 'Z970 Grand X' ),
+			'ZTE U985'									=> array( 'ZTE', 'U985 Grand Era' ),
+			'ZTE Roamer'								=> array( 'ZTE', 'Z990 Roamer ' ),
+			'ZTE Z990!'									=> array( 'ZTE', 'Z990 Roamer' ),
+			'N9500'										=> array( 'ZTE', 'N9500 Flash' ),
+			'003Z'										=> array( 'ZTE', 'Softbank 003Z' ),
+			'008Z'										=> array( 'ZTE', 'Softbank 008Z' ),
+			'009Z'										=> array( 'ZTE', 'Softbank Star7' ),
+			'ZP100'										=> array( 'Zopo', 'ZP100' ),
+			'ZP200'										=> array( 'Zopo', 'ZP200' ),
+			'ZP300'										=> array( 'Zopo', 'ZP300' ),
+			'ZP500'										=> array( 'Zopo', 'ZP500' ),
+	
+			/* Telecom provider branded devices */
+			'i-mobile i691'								=> array( 'i-Mobile', 'i691' ),
+			'i-mobile i695'								=> array( 'i-Mobile', 'i695' ),
+			'i-mobile i858'								=> array( 'i-Mobile', 'i858' ),
+			'i-mobile 3G 8500'							=> array( 'i-Mobile', '3G 8500' ),
+			'i-mobile IQ 1'								=> array( 'i-Mobile', 'iQ 1' ),	
+			'i-mobile i-style 3'						=> array( 'i-Mobile', 'i-Style 3' ),	
+			'i-mobile i-style Q1'						=> array( 'i-Mobile', 'i-Style Q1' ),						
+			'i-mobile i-STYLE Q2'						=> array( 'i-Mobile', 'i-Style Q2' ),			
+			'i-mobile i-STYLE Q2 DUO'					=> array( 'i-Mobile', 'i-Style Q2 Duo' ),
+			'i-mobile i-style Q3'						=> array( 'i-Mobile', 'i-Style Q3' ),				
+			'i-mobile i-STYLE Q6'						=> array( 'i-Mobile', 'i-Style Q6' ),						
+			'i-mobile I-Note'							=> array( 'i-Mobile', 'i-Note', TYPE_TABLET ),
+			'i-mobile i-note WiFi 7'					=> array( 'i-Mobile', 'i-Note 7', TYPE_TABLET ),
+	
+			'Etisalat Smartphone'						=> array( 'Etisalat', 'Smartphone' ),	
+			
+			'Optimus Boston'							=> array( 'Optimus', 'Boston' ),							/* Gigabyte GSmart G1305 */
+			'Optimus San Francisco'						=> array( 'Optimus', 'San Francisco' ),						/* ZTE Blade */
+			'Optimus Monte Carlo'						=> array( 'Optimus', 'Monte Carlo' ),						/* ZTE Skate */
+			
+			'Orange Boston'								=> array( 'Orange', 'Boston' ),								/* Gigabyte GSmart G1305 */
+			'Orange Monte Carlo'						=> array( 'Orange', 'Monte Carlo' ),						/* ZTE Skate */
+			'San Francisco'								=> array( 'Orange', 'San Francisco' ),						/* ZTE Blade */
+			'San Francisco for Orange'					=> array( 'Orange', 'San Francisco' ),						/* ZTE Blade */
+			'Orange San Francisco'						=> array( 'Orange', 'San Francisco' ),						/* ZTE Blade */
+			
+			'MOVE'										=> array( 'T-Mobile', 'MOVE' ),								/* Alcatel One Touch 908 */
+			'T-Mobile G1'								=> array( 'T-Mobile', 'G1' ),								/* HTC Dream */
+			'T-Mobile G2'								=> array( 'T-Mobile', 'G2' ),								/* HTC Desire Z */
+			'T-Mobile G2 Touch'							=> array( 'T-Mobile', 'G2' ),								/* HTC Desire Z */
+			'LG-P999'									=> array( 'T-Mobile', 'G2x' ),								/* LG Optimus 2X */
+			'LG-E739'									=> array( 'T-Mobile', 'myTouch' ),							/* LG E739 */
+			'T-Mobile myTouch'							=> array( 'T-Mobile', 'myTouch' ),							/* LG E739 */
+			'T-Mobile myTouch 3G'						=> array( 'T-Mobile', 'myTouch 3G'),						/* HTC Magic */
+			'T-Mobile myTouch 3G Slide'					=> array( 'T-Mobile', 'myTouch 3G Slide' ),					/* HTC Espresso */
+			'HTC T-Mobile myTouch 3G Slide'				=> array( 'T-Mobile', 'myTouch 3G Slide' ),					/* HTC Espresso */
+			'T-Mobile Espresso'							=> array( 'T-Mobile', 'myTouch 3G Slide' ),					/* HTC Espresso */
+			'HTC my ?Touch 3G Slide!'					=> array( 'T-Mobile', 'myTouch 3G Slide' ),					/* HTC Espresso */
+			'T-Mobile myTouch 4G'						=> array( 'T-Mobile', 'myTouch 4G' ),						/* HTC Glacier */
+			'HTC Glacier'								=> array( 'T-Mobile', 'myTouch 4G' ),						/* HTC Glacier */
+			'HTC Panache'								=> array( 'T-Mobile', 'myTouch 4G' ),						/* HTC Glacier */
+			'My ?Touch ?4G$!'							=> array( 'T-Mobile', 'myTouch 4G' ),						/* HTC Glacier */
+			'HTC My ?Touch ?4G$!'						=> array( 'T-Mobile', 'myTouch 4G' ),						/* HTC Glacier */
+			'HTC myTouch 4G Slide'						=> array( 'T-Mobile', 'myTouch 4G Slide' ),					/* HTC Doubleshot */
+			'myTouch 4G Slide'							=> array( 'T-Mobile', 'myTouch 4G Slide' ),					/* HTC Doubleshot */
+			'T-Mobile myTouch Q'						=> array( 'T-Mobile', 'myTouch Q' ),						/* Huawei U8730 */
+			'LG-C800'									=> array( 'T-Mobile', 'myTouch Q' ),
+			'Pulse Mini'								=> array( 'T-Mobile', 'Pulse Mini' ),						/* Huawei U8110 */
+			
+			'Turkcell Maxi Plus 5'						=> array( 'Turkcell', 'Maxi Plus 5' ),
+			'Turkcell T20'								=> array( 'Turkcell', 'T20' ),
+		
+			'MTC 950'									=> array( 'MTC', '950' ),
+			'MTC 955'									=> array( 'MTC', '955' ),
+			'MTC 960'									=> array( 'MTC', '960' ),
+			'MTC Evo'									=> array( 'MTC', 'Evo' ),
+			
+			'Vodafone 845'								=> array( 'Vodafone', '845 Nova' ),							/* Huawei U8100 */
+			'Vodafone 858'								=> array( 'Vodafone', '858 Smart' ),						/* Huawei U8160 */
+			'Vodafone 945'								=> array( 'Vodafone', '945' ),								/* ZTE Joe */
+			'Vodafone Smart II'							=> array( 'Vodafone', 'Smart II' ),
+			'SmartTabII7'								=> array( 'Vodafone', 'SmartTab II 7', TYPE_TABLET ),		/* Lenovo */
+			'SmartTab10'								=> array( 'Vodafone', 'SmartTab 10', TYPE_TABLET )			/* ZTE Web Tab 10 */
+		);
+		
+		static $BADA_MODELS = array(
+			'GT- ?S52(50|53)!'							=> array( 'Samsung', 'Wave 525' ),
+			'GT-S5330'									=> array( 'Samsung', 'Wave 533' ),
+			'GT-S5380!'									=> array( 'Samsung', 'Wave Y' ),
+			'GT-S57(50|53)!'							=> array( 'Samsung', 'Wave 575' ),
+			'GT-S72(30|33)!'							=> array( 'Samsung', 'Wave 723' ),
+			'GT-S7250!'									=> array( 'Samsung', 'Wave M' ),
+			'GT-S8500!'									=> array( 'Samsung', 'Wave' ),
+			'GT-S8530'									=> array( 'Samsung', 'Wave II' ),
+			'GT-S8600'									=> array( 'Samsung', 'Wave 3' ),
+			'SHW-M410'									=> array( 'Samsung', 'Wave 3' )
+		);
+		
+		static $BREW_MODELS = array(
+			'Coolpad D508'								=> array( 'Coolpad', 'D508' ),
+			'Coolpad E600'								=> array( 'Coolpad', 'E600' ),
+			'SCH-F839'									=> array( 'Samsung', 'SCH-F839' ),
+			'HS-E316!'									=> array( 'Hisense', 'E316' ),
+		);
+		
+		static $TIZEN_MODELS = array(
+			'GT-I8800'									=> array( 'Samsung', 'GT-I8800' ),
+			'GT-I9500'									=> array( 'Samsung', 'GT-I9500' )
+		);
+		
+		static $TOUCHWIZ_MODELS = array(
+			'GT-B5310!'									=> array( 'Samsung', 'Corby Pro' ),
+			'GT-B3410'									=> array( 'Samsung', 'Star Qwerty' ),
+			'GT-B7722'									=> array( 'Samsung', 'Star Duos' ),
+			'GT-C3262'									=> array( 'Samsung', 'Champ Neo Duos' ),
+			'GT-C33(00|03)!'							=> array( 'Samsung', 'Champ' ),
+			'GT-C3312'									=> array( 'Samsung', 'Champ Deluxe Duos' ),
+			'GT-C3330'									=> array( 'Samsung', 'Champ 2' ),
+			'GT-C6712'									=> array( 'Samsung', 'Star II Duos' ),
+			'GT-M3710'									=> array( 'Samsung', 'Corby Beat' ),
+			'GT-M5650'									=> array( 'Samsung', 'Lindy' ),
+			'GT-S3370C'									=> array( 'Samsung', 'Corby 3G' ),
+			'GT-S36(50|53)!'							=> array( 'Samsung', 'Corby' ),
+			'GT-S3850'									=> array( 'Samsung', 'Corby II' ),
+			'GT-S5220'									=> array( 'Samsung', 'Star 3' ),
+			'GT-S5222'									=> array( 'Samsung', 'Star 3 Duos' ),
+			'GT-S52(30|33)!'							=> array( 'Samsung', 'Star' ),
+			'GT-S5260'									=> array( 'Samsung', 'Star II' ),
+			'GT-S5560'									=> array( 'Samsung', 'Marvel' ),
+			'GT-S5620!'									=> array( 'Samsung', 'Monte' ),
+			'GT-S5680'									=> array( 'Samsung', 'GT-S5680' ),
+			'GT-S7550'									=> array( 'Samsung', 'Blue Earth' ),
+			'S80(00|03)!'								=> array( 'Samsung', 'Jet' ),
+			'SGH-F480'									=> array( 'Samsung', 'Tocco' ),
+			'SGH-T528g'									=> array( 'Samsung', 'Straight Talk' )		
+		);
+		
+		static $WINDOWS_MOBILE_MODELS = array(
+			'DX900'										=> array( 'Acer', 'Tempo DX900' ),
+			'F900'										=> array( 'Acer', 'Tempo F900' ),
+			'Coolpad F800'								=> array( 'Coolpad', 'F800' ),
+			'T5388'										=> array( 'Dopod', 'Touch Diamond 2' ),
+			'garmin-asus-Nuvifone-M10'					=> array( 'Garmin-Asus', 'Nuvifone M10' ),
+			'HP iPAQ 510'								=> array( 'HP', 'iPAQ 510' ),
+			'((HTC )?HD mini|.*T5555)!'					=> array( 'HTC', 'HD mini' ),
+			'((HTC )?HD2|.*T8585)!'						=> array( 'HTC', 'HD2' ),
+			'T-Mobile LEO'								=> array( 'HTC', 'HD2' ),
+			'dopodT5588'								=> array( 'HTC', 'Hengshan' ),
+			'(HTC Mega|.*T3333)!'						=> array( 'HTC', 'Mega' ),
+			'(HTC Snap|.*S521)!'						=> array( 'HTC', 'Snap' ),
+			'(HTC Touch2|.*T33(20|33|35))!'				=> array( 'HTC', 'Touch 2' ),
+			'(HTC Touch Diamond2|.*T5353)!'				=> array( 'HTC', 'Touch Diamond 2' ),
+			'XV6975'									=> array( 'HTC', 'Touch Diamond 2' ),
+			'(HTC Touch Diamond|.*P3700)!'				=> array( 'HTC', 'Touch Diamond' ),
+			'(HTC Touch HD2|.*T8585)!'					=> array( 'HTC', 'Touch HD2' ),
+			'(HTC Touch HD|.*T82(82|83))!'				=> array( 'HTC', 'Touch HD' ),
+			'(HTC Touch Pro2|.*T73(73|80))!'			=> array( 'HTC', 'Touch Pro 2' ),
+			'HTC TyTN II'								=> array( 'HTC', 'TyTN II' ),
+			'GT-B5722'									=> array( 'Samsung', 'B5722' ),	
+			'GT-B6520'									=> array( 'Samsung', 'B6520 OmniaPRO 5' ),	
+			'GT-B7300'									=> array( 'Samsung', 'B7300 OmniaLITE' ),
+			'GT-B7320'									=> array( 'Samsung', 'B7320 OmniaPRO' ),
+			'GT-B7330'									=> array( 'Samsung', 'B7330 OmniaPRO' ),
+			'GT-B7350'									=> array( 'Samsung', 'B7350 OmniaPRO 4' ),
+			'GT-B7610'									=> array( 'Samsung', 'B7610 OmniaPRO' ),
+			'GT-C6625'									=> array( 'Samsung', 'C6625 Valencia' ),
+			'GT-I8000!'									=> array( 'Samsung', 'I8000 Omnia II' ),
+			'WS007SH'									=> array( 'Sharp', 'W-ZERO3' ),
+			'M1i' 										=> array( 'Sony Ericsson', 'M1i Aspen' )
+		);
+		
+		static $WINDOWS_PHONE_MODELS = array(
+			'Allegro'									=> array( 'Acer', 'Allegro' ),
+			'M310'										=> array( 'Acer', 'Allegro' ),
+			'Galaxy6'									=> array( 'Asus', 'Galaxy 6' ),
+			'Venue Pro'									=> array( 'Dell', 'Venue Pro' ),
+			'IS12T'										=> array( 'Fujitsu Toshiba', 'IS12T' ),
+			'USCCHTC-PC93100'							=> array( 'HTC', 'Arrive' ),
+			'Gold'										=> array( 'HTC', 'Gold' ),
+			'HD2'										=> array( 'HTC', 'HD2' ),
+			'LEO'										=> array( 'HTC', 'HD2' ),
+			'(HD7|.*T92(92|95|96))!'					=> array( 'HTC', 'HD7' ),
+			'Schubert!'									=> array( 'HTC', 'HD7' ),
+			'(7 Pro|.*T75(75|76))!'						=> array( 'HTC', '7 Pro' ),
+			'((7 )?Mozart|.*T86(97|98))!'				=> array( 'HTC', '7 Mozart' ),
+			'PD67100'									=> array( 'HTC', '7 Mozart' ), 
+			'((7 )?Trophy|.*T8686)!'					=> array( 'HTC', 'Trophy' ),
+			'mwp6985'									=> array( 'HTC', 'Trophy' ),
+			'PC40100'									=> array( 'HTC', 'Trophy' ),
+			'Touch-IT Trophy'							=> array( 'HTC', 'Trophy' ),
+			'(Radar|.*C110e)!'							=> array( 'HTC', 'Radar' ),
+			'Mazaa'										=> array( 'HTC', 'Mazaa' ), 
+			'Mondrian'									=> array( 'HTC', 'Mondrian' ),
+			'Spark'										=> array( 'HTC', 'Spark' ),
+			'.*T8788!'									=> array( 'HTC', 'Surround' ),
+			'.*X310e!'									=> array( 'HTC', 'Titan' ),
+			'PI39100'									=> array( 'HTC', 'Titan' ),
+			'Eternity'									=> array( 'HTC', 'Titan' ),
+			'PI86100'									=> array( 'HTC', 'Titan II' ),
+			'Ultimate'									=> array( 'HTC', 'Ultimate' ),
+			'HTC6990LVW'								=> array( 'HTC', '8X' ),
+			'RIO U'										=> array( 'HTC', '8X' ),
+			'Windows Phone 8X by HTC'					=> array( 'HTC', '8X' ),
+			'Windows Phone 8S by HTC'					=> array( 'HTC', '8S' ),
+			'HUAWEI Ascend W1!'							=> array( 'Huawei', 'Ascend W1' ),
+			'GW910'										=> array( 'LG', 'Optimus 7' ),
+			'LG-E-?900!'								=> array( 'LG', 'Optimus 7 E900' ),
+			'LG-E906'									=> array( 'LG', 'Jil Sander' ),
+			'LG-C900!'									=> array( 'LG', 'Optimus 7Q' ),
+			'(Lumia ?|Nokia )?510!'						=> array( 'Nokia', 'Lumia 510' ),
+			'(Lumia ?|Nokia )?610!'						=> array( 'Nokia', 'Lumia 610' ),
+			'(Lumia ?|Nokia )?710!'						=> array( 'Nokia', 'Lumia 710' ),
+			'Lumia 719'									=> array( 'Nokia', 'Lumia 719' ),
+			'(Lumia ?|Nokia )?800!'						=> array( 'Nokia', 'Lumia 800' ),
+			'SeaRay'									=> array( 'Nokia', 'Lumia 800' ),
+			'Lumia ?810!'								=> array( 'Nokia', 'Lumia 810' ),
+			'Lumia ?820!'								=> array( 'Nokia', 'Lumia 820' ),
+			'Lumia ?822!'								=> array( 'Nokia', 'Lumia 822' ),
+			'(Lumia ?|Nokia )?900!'						=> array( 'Nokia', 'Lumia 900' ),
+			'(Lumia ?|Nokia )?920!'						=> array( 'Nokia', 'Lumia 920' ),
+			'GT-I8350!'									=> array( 'Samsung', 'Omnia W' ),
+			'GT-i8700'									=> array( 'Samsung', 'Omnia 7' ),
+			'GT-I8750'									=> array( 'Samsung', 'Ativ S' ),
+			'GT-S7530'									=> array( 'Samsung', 'Omnia M' ),
+			'SGH-i667'									=> array( 'Samsung', 'Focus 2' ),
+			'SGH-i677'									=> array( 'Samsung', 'Focus Flash' ),
+			'SGH-i707'									=> array( 'Samsung', 'Taylor' ),
+			'SGH-i917!'									=> array( 'Samsung', 'Focus' ),
+			'SGH-i937!'									=> array( 'Samsung', 'Focus S' ),
+			'SGH-T899M'									=> array( 'Samsung', 'Ativ S' ),
+			'OM(NI|IN)A ?7!'							=> array( 'Samsung', 'Omnia 7' ),
+			'Taylor'									=> array( 'Samsung', 'Taylor' ),
+			'CETUS'										=> array( 'Samsung', 'Cetus' ),
+			'I917'										=> array( 'Samsung', 'Cetus' ),
+			'S606'										=> array( 'TCL', 'Horizon S606' ),
+			'TSUNAGI'									=> array( 'Toshiba', 'Tsunagi' ),
+			'N880e!'									=> array( 'ZTE', 'N880e' ),
+			'V965W'										=> array( 'ZTE', 'V965W Tania' ),
+			'Tania'										=> array( 'ZTE', 'V965W Tania' )
+		);
+		
+		static $S40_MODELS = array(
+			'C1-01'										=> array( 'Nokia', 'C1-01' ),
+			'C1-02'										=> array( 'Nokia', 'C1-02' ),
+			'C2-00'										=> array( 'Nokia', 'C2-00' ),
+			'C2-01'										=> array( 'Nokia', 'C2-01' ),
+			'C2-02'										=> array( 'Nokia', 'C2-02' ),
+			'C2-03'										=> array( 'Nokia', 'C2-03' ),
+			'C2-05'										=> array( 'Nokia', 'C2-05' ),
+			'C2-06'										=> array( 'Nokia', 'C2-06' ),
+			'C3-00'										=> array( 'Nokia', 'C3-00' ),
+			'C3-01!'									=> array( 'Nokia', 'C3-01' ),
+			'X2-00'										=> array( 'Nokia', 'X2-00' ),
+			'X2-01!'									=> array( 'Nokia', 'X2-01' ),
+			'X2-02'										=> array( 'Nokia', 'X2-02' ),
+			'X2-05'										=> array( 'Nokia', 'X2-05' ),
+			'X3-00'										=> array( 'Nokia', 'X3-00' ),
+			'X3-02'										=> array( 'Nokia', 'X3-02' ),
+			'109'										=> array( 'Nokia', '109' ),
+			'110'										=> array( 'Nokia', '110' ),
+			'111'										=> array( 'Nokia', '111' ),
+			'112'										=> array( 'Nokia', '112' ),
+			'200'										=> array( 'Nokia', 'Asha 200' ),
+			'201'										=> array( 'Nokia', 'Asha 201' ),
+			'202'										=> array( 'Nokia', 'Asha 202' ),
+			'203'										=> array( 'Nokia', 'Asha 203' ),
+			'300'										=> array( 'Nokia', 'Asha 300' ),
+			'302'										=> array( 'Nokia', 'Asha 302' ),
+			'303'										=> array( 'Nokia', 'Asha 303' ),
+			'305'										=> array( 'Nokia', 'Asha 305' ),
+			'306'										=> array( 'Nokia', 'Asha 306' ),
+			'309'										=> array( 'Nokia', 'Asha 309' ),
+			'308'										=> array( 'Nokia', 'Asha 308' ),
+			'311'										=> array( 'Nokia', 'Asha 311' ),
+			'1682c'										=> array( 'Nokia', '1682 classic' ),
+			'2220s!'									=> array( 'Nokia', '2220 slide' ),
+			'2320c!'									=> array( 'Nokia', '2320 classic' ),
+			'2323c!'									=> array( 'Nokia', '2323 classic' ),
+			'2330c!'									=> array( 'Nokia', '2330 classic' ),
+			'2600c!'									=> array( 'Nokia', '2600 classic' ),
+			'2680s!'									=> array( 'Nokia', '2680 slide' ),
+			'2690'										=> array( 'Nokia', '2690' ),
+			'2700c!'									=> array( 'Nokia', '2700 classic' ),
+			'2710c'										=> array( 'Nokia', '2710' ),
+			'2720a!'									=> array( 'Nokia', '2720 fold' ),
+			'2730c!'									=> array( 'Nokia', '2730 classic' ),
+			'3110c'										=> array( 'Nokia', '3110 Evolve' ),
+			'3120c'										=> array( 'Nokia', '3120 classic' ),
+			'3208c'										=> array( 'Nokia', '3208 classic' ),
+			'3555b'										=> array( 'Nokia', '3555' ),
+			'3600s'										=> array( 'Nokia', '3600 slide' ),
+			'3610a'										=> array( 'Nokia', '3610 fold' ),
+			'3710fold'									=> array( 'Nokia', '3710 fold' ),
+			'3720c'										=> array( 'Nokia', '3720 classic' ),
+			'5000!'										=> array( 'Nokia', '5000' ),
+			'5130!'										=> array( 'Nokia', '5130 XpressMusic' ),
+			'5220!'										=> array( 'Nokia', '5220 XpressMusic' ),
+			'5330'										=> array( 'Nokia', '5330 Mobile TV Edition' ),
+			'6208c'										=> array( 'Nokia', '6208 classic' ),
+			'6212c'										=> array( 'Nokia', '6212 classic' ),
+			'6260s!'									=> array( 'Nokia', '6260 slide' ),
+			'6263!'										=> array( 'Nokia', '6263' ),
+			'6300i'										=> array( 'Nokia', '6300i' ),
+			'6303classic'								=> array( 'Nokia', '6303 classic' ),
+			'6303iclassic'								=> array( 'Nokia', '6303i classic' ),
+			'6303ci'									=> array( 'Nokia', '6303i classic' ),
+			'6350'										=> array( 'Nokia', '6350' ),
+			'6600f!'									=> array( 'Nokia', '6600 fold' ),
+			'6600s!'									=> array( 'Nokia', '6600 slide' ),
+			'6700c!'									=> array( 'Nokia', '6700 classic' ),
+			'6750c'										=> array( 'Nokia', '6750 Mural' ),
+			'7070!'										=> array( 'Nokia', '7070 Prism' ),
+			'7100s!'									=> array( 'Nokia', '7100 Supernova' ),
+			'7210s!'									=> array( 'Nokia', '7210 Supernova' ),
+			'7230'										=> array( 'Nokia', '7230' ),
+			'7310c!'									=> array( 'Nokia', '7310 Supernova' ),
+			'7510Supernova!'							=> array( 'Nokia', '7510 Supernova' ),
+			'7610Supernova!'							=> array( 'Nokia', '7610 Supernova' ),
+			'8800!'										=> array( 'Nokia', '8800 Arte' )
+		);
+		
+		static $S60_MODELS = array(
+			'U1i'										=> array( 'Sony Ericsson', 'Satio' ),
+			'U5i'										=> array( 'Sony Ericsson', 'Vivaz' ),
+			'U8i'										=> array( 'Sony Ericsson', 'Vivaz Pro' ),
+			'I7710'										=> array( 'Samsung', 'GT-I7710' ),
+			'I8510'										=> array( 'Samsung', 'INNOV8' ),
+			'I8910'										=> array( 'Samsung', 'Omnia HD' ),
+			'C5-00!'									=> array( 'Nokia', 'C5-00' ),
+			'C5-01'										=> array( 'Nokia', 'C5-01' ),
+			'C5-03!'									=> array( 'Nokia', 'C5-03' ),
+			'C5-04'										=> array( 'Nokia', 'C5-04' ),
+			'C5-05'										=> array( 'Nokia', 'C5-05' ),
+			'C5-06'										=> array( 'Nokia', 'C5-06' ),
+			'C6-00!'									=> array( 'Nokia', 'C6-00' ),
+			'C6-01!'									=> array( 'Nokia', 'C6-01' ),
+			'C7-00'										=> array( 'Nokia', 'C7-00' ),
+			'E5-00!'									=> array( 'Nokia', 'E5-00' ),
+			'E6'										=> array( 'Nokia', 'E6-00' ),
+			'E6-00'										=> array( 'Nokia', 'E6-00' ),
+			'E7-00'										=> array( 'Nokia', 'E7-00' ),
+			'N8-00'										=> array( 'Nokia', 'N8-00' ),
+			'T7-00'										=> array( 'Nokia', 'T7-00' ),
+			'X5-00'										=> array( 'Nokia', 'X5-00' ),
+			'X5-01'										=> array( 'Nokia', 'X5-01' ),
+			'X6-00!'									=> array( 'Nokia', 'X6-00' ),
+			'X7-00'										=> array( 'Nokia', 'X7-00' ),
+			'N-Gage'									=> array( 'Nokia', 'N-Gage' ),
+			'N-GageQD'									=> array( 'Nokia', 'N-Gage QD' ),
+			'E50!'										=> array( 'Nokia', 'E50' ),
+			'E51!'										=> array( 'Nokia', 'E51' ),
+			'E52!'										=> array( 'Nokia', 'E52' ),
+			'E55!'										=> array( 'Nokia', 'E55' ),
+			'E60!'										=> array( 'Nokia', 'E60' ),
+			'E61i!'										=> array( 'Nokia', 'E61i' ),
+			'E61!'										=> array( 'Nokia', 'E61' ),
+			'E62!'										=> array( 'Nokia', 'E62' ),
+			'E63!'										=> array( 'Nokia', 'E63' ),
+			'E65!'										=> array( 'Nokia', 'E65' ),
+			'E66!'										=> array( 'Nokia', 'E66' ),
+			'E70!'										=> array( 'Nokia', 'E70' ),
+			'E71x'										=> array( 'Nokia', 'E71x' ),
+			'E71!'										=> array( 'Nokia', 'E71' ),
+			'E72!'										=> array( 'Nokia', 'E72' ),
+			'E73!'										=> array( 'Nokia', 'E73 Mode' ),
+			'E75!'										=> array( 'Nokia', 'E75 '),
+			'E90!'										=> array( 'Nokia', 'E90 Communicator '),
+			'N70!'										=> array( 'Nokia', 'N70' ),
+			'N71!'										=> array( 'Nokia', 'N71' ),
+			'N72!'										=> array( 'Nokia', 'N72' ),
+			'N73!'										=> array( 'Nokia', 'N73' ),
+			'N75!'										=> array( 'Nokia', 'N75' ),
+			'N76!'										=> array( 'Nokia', 'N76' ),
+			'N77!'										=> array( 'Nokia', 'N77' ),
+			'N78!'										=> array( 'Nokia', 'N78' ),
+			'N79!'										=> array( 'Nokia', 'N79' ),
+			'N80!'										=> array( 'Nokia', 'N80' ),
+			'N81!'										=> array( 'Nokia', 'N81' ),
+			'N82!'										=> array( 'Nokia', 'N82' ),
+			'N85!'										=> array( 'Nokia', 'N85' ),
+			'N86!'										=> array( 'Nokia', 'N86 8MP' ),
+			'N90!'										=> array( 'Nokia', 'N90' ),
+			'N91!'										=> array( 'Nokia', 'N91' ),
+			'N92!'										=> array( 'Nokia', 'N92' ),
+			'N93-1'										=> array( 'Nokia', 'N93' ),
+			'N93i'										=> array( 'Nokia', 'N93i' ),
+			'N95'										=> array( 'Nokia', 'N95' ),
+			'N95 8GB'									=> array( 'Nokia', 'N95 8GB' ),
+			'N95-3'										=> array( 'Nokia', 'N95-3 NAM' ),
+			'N96-1'										=> array( 'Nokia', 'N96' ),
+			'N96-3'										=> array( 'Nokia', 'N96-3' ),
+			'N97'										=> array( 'Nokia', 'N97' ),
+			'N97i'										=> array( 'Nokia', 'N97' ),
+			'N97-1'										=> array( 'Nokia', 'N97' ),
+			'N97-3'										=> array( 'Nokia', 'N97' ),
+			'N97-4'										=> array( 'Nokia', 'N97 Mini' ),
+			'N97-5'										=> array( 'Nokia', 'N97 Mini' ),
+			'N97mini'									=> array( 'Nokia', 'N97 Mini' ),
+			'500!'										=> array( 'Nokia', '500' ),
+			'603'										=> array( 'Nokia', '603' ),
+			'700'										=> array( 'Nokia', '700' ),
+			'701'										=> array( 'Nokia', '701' ),
+			'702T'										=> array( 'Nokia', '702T' ),
+			'808!'										=> array( 'Nokia', '808 PureView' ),
+			'5228'										=> array( 'Nokia', '5228' ),
+			'5233!'										=> array( 'Nokia', '5228' ),
+			'5230!'										=> array( 'Nokia', '5230' ),
+			'5235'										=> array( 'Nokia', '5235 Ovi Music Unlimited' ),
+			'5250'										=> array( 'Nokia', '5250' ),
+			'5320!'										=> array( 'Nokia', '5320 XpressMusic' ),
+			'5500d!'									=> array( 'Nokia', '5500 Sport' ),
+			'5530!'										=> array( 'Nokia', '5530 XpressMusic' ),
+			'5630!'										=> array( 'Nokia', '5630 XpressMusic' ),
+			'5700!'										=> array( 'Nokia', '5700 XpressMusic' ),
+			'5730!'										=> array( 'Nokia', '5730 XpressMusic' ),
+			'5800!'										=> array( 'Nokia', '5800 XpressMusic' ),
+			'6110Navigator'								=> array( 'Nokia', '6110 Navigator' ),
+			'6120c!'									=> array( 'Nokia', '6120 classic' ),
+			'6121c!'									=> array( 'Nokia', '6121 classic' ),
+			'6124c'										=> array( 'Nokia', '6124 classic' ),
+			'6210Navigator'								=> array( 'Nokia', '6210 Navigator' ),
+			'6220c!'									=> array( 'Nokia', '6220 classic' ),
+			'6290!'										=> array( 'Nokia', '6290' ),
+			'6650d!'									=> array( 'Nokia', '6650 fold' ),
+			'6700s'										=> array( 'Nokia', '6700 slide' ),
+			'6710s'										=> array( 'Nokia', '6710 Navigator' ),
+			'6720c'										=> array( 'Nokia', '6720 classic' ),
+			'6730c'										=> array( 'Nokia', '6730 classic' ),
+			'6760s!'									=> array( 'Nokia', '6760 slide' ),
+			'6788'										=> array( 'Nokia', '6788' ),
+			'6788i'										=> array( 'Nokia', '6788i' ),
+			'6790s-1b!'									=> array( 'Nokia', '6790 Surge' ),
+			'6790s-1c!'									=> array( 'Nokia', '6790 slide' ),
+			'7610'										=> array( 'Nokia', '7610' )
+		);
+		
+		static $FEATURE_MODELS = array(
+			'J108[ai]!'									=> array( 'Sony Ericsson', 'Cedar' ),
+			'J20'										=> array( 'Sony Ericsson', 'Hazel' ),
+			'KC910i'									=> array( 'LG', 'KC910i Renoir' ),
+			'KP500!'									=> array( 'LG', 'KP500 Cookie' ),
+			'GS500'										=> array( 'LG', 'GS500 Cookie Plus' ),
+			'GT-S3350'									=> array( 'Samsung', 'Ch@t 335' ),
+			'GT-S3570'									=> array( 'Samsung', 'Ch@t 357' ),
+			'GT-S5610K'									=> array( 'Samsung', 'Primo' ),
+			'SGH-A667'									=> array( 'Samsung', 'A667 Evergreen' ),
+		);
+
+		static $BLACKBERRY_MODELS = array(
+			'9000'		=> 'Bold',
+			'9600'		=> 'Bold',
+			'9650'		=> 'Bold',
+			'9700'		=> 'Bold',
+			'9780'		=> 'Bold',
+			'9790'		=> 'Bold',
+			'9900'		=> 'Bold',
+			'9930'		=> 'Bold',
+			'8300'		=> 'Curve',
+			'8310'		=> 'Curve',
+			'8320'		=> 'Curve',
+			'8330'		=> 'Curve',
+			'8350i'		=> 'Curve',
+			'8520'		=> 'Curve',
+			'8530'		=> 'Curve',
+			'8900'		=> 'Curve',
+			'9220'		=> 'Curve',
+			'9300'		=> 'Curve',
+			'9310'		=> 'Curve',
+			'9320'		=> 'Curve',
+			'9330'		=> 'Curve',
+			'9350'		=> 'Curve',
+			'9360'		=> 'Curve',
+			'9370'		=> 'Curve',
+			'9380'		=> 'Curve',
+			'8100'		=> 'Pearl',
+			'8110'		=> 'Pearl',
+			'8120'		=> 'Pearl',
+			'8130'		=> 'Pearl',
+			'8220'		=> 'Pearl',
+			'8230'		=> 'Pearl',
+			'9100'		=> 'Pearl',
+			'9105'		=> 'Pearl',
+			'9530'		=> 'Storm',
+			'9550'		=> 'Storm',
+			'9670'		=> 'Style',
+			'9800'		=> 'Torch',
+			'9810'		=> 'Torch',
+			'9850'		=> 'Torch',
+			'9860'		=> 'Torch',
+			'9630'		=> 'Tour',
+			'9981'		=> 'Porsche P'
+		);
+		
+	
+	
+		function identify($type, $model) {
+			switch($type) {
+				case 'android':		return DeviceModels::identifyAndroid($model);
+				case 'blackberry':	return DeviceModels::identifyBlackBerry($model);
+				case 'bada': 		return DeviceModels::identifyList(DeviceModels::$BADA_MODELS, $model);
+				case 'brew': 		return DeviceModels::identifyList(DeviceModels::$BREW_MODELS, $model);
+				case 'tizen': 		return DeviceModels::identifyList(DeviceModels::$TIZEN_MODELS, $model);
+				case 'touchwiz': 	return DeviceModels::identifyList(DeviceModels::$TOUCHWIZ_MODELS, $model);
+				case 'wm': 			return DeviceModels::identifyList(DeviceModels::$WINDOWS_MOBILE_MODELS, $model);
+				case 'wp': 			return DeviceModels::identifyList(DeviceModels::$WINDOWS_PHONE_MODELS, $model);
+				case 's40': 		return DeviceModels::identifyList(DeviceModels::$S40_MODELS, $model);
+				case 's60': 		return DeviceModels::identifyList(DeviceModels::$S60_MODELS, $model);
+				case 'feature': 	return DeviceModels::identifyList(DeviceModels::$FEATURE_MODELS, $model);
+			}
+
+			return (object) array('type' => '', 'model' => $model, 'identified' => false);
+		}
+		
+		function identifyAndroid($model) {
+			$result = DeviceModels::identifyList(DeviceModels::$ANDROID_MODELS, $model);
+
+			if (!$result->identified) {
+				$model = DeviceModels::cleanup($model);
+				if (preg_match('/AndroVM/i', $model)  || $model == 'Emulator' || $model == 'x86 Emulator' || $model == 'x86 VirtualBox' || $model == 'vm') {
+					return (object) array(
+						'type'			=> 'emulator',
+						'identified'	=> true,
+						'manufacturer'	=> null,
+						'model'			=> null
+					);
+				}
+			}
+			
+			return $result;
+		}
+		
+		function identifyBlackBerry($model) {
+			if (isset(DeviceModels::$BLACKBERRY_MODELS[$model])) return 'BlackBerry ' . DeviceModels::$BLACKBERRY_MODELS[$model] . ' ' . $model;
+			return 'BlackBerry ' . $model;
+		}
+		
+		function identifyList($list, $model) {
+			$model = DeviceModels::cleanup($model);
+			
+			$device = (object) array(
+				'type'			=> TYPE_MOBILE,
+				'identified'	=> false,
+				'manufacturer'	=> null,
+				'model'			=> $model
+			);
+
+			foreach ($list as $m => $v) {
+				$match = false;
+				if (substr($m, -1) == "!") 
+					$match = preg_match('/^' . substr($m, 0, -1) . '/i', $model);
+				else
+					$match = strtolower($m) == strtolower($model);
+				
+				if ($match) {
+ 					$device->manufacturer = $v[0];
+					$device->model = $v[1];
+					if (isset($v[2])) $device->type = $v[2];
+					if (isset($v[3])) $device->flag = $v[3];
+					$device->identified = true;
+					return $device;
+				}
+			}
+			
+			return $device;
+		}
+		
+		function cleanup($s = '') {
+			$s = preg_replace('/\/[^\/]+$/', '', $s);
+			$s = preg_replace('/\/[^\/]+ Android\/.*/', '', $s);
+			
+			$s = preg_replace('/UCBrowser$/', '', $s);
+
+			$s = preg_replace('/_TD$/', '', $s);
+			$s = preg_replace('/_CMCC$/', '', $s);
+			
+			$s = preg_replace('/_/', ' ', $s);
+			$s = preg_replace('/^\s+|\s+$/', '', $s);
+			
+			$s = preg_replace('/^tita on /', '', $s);
+			$s = preg_replace('/^ICS AOSP on /', '', $s);
+			$s = preg_replace('/^Android (on |for )/', '', $s);
+			$s = preg_replace('/^Full (AOSP on |Android on |Cappuccino on |MIPS Android on |Android)/', '', $s);
+
+			$s = preg_replace('/^Acer( |-)?/i', '', $s);
+			$s = preg_replace('/^Iconia( Tab)? /', '', $s);
+			$s = preg_replace('/^ASUS ?/', '', $s);
+			$s = preg_replace('/^Ainol /', '', $s);
+			$s = preg_replace('/^Coolpad ?/i', 'Coolpad ', $s);
+			$s = preg_replace('/^ALCATEL /', '', $s);
+			$s = preg_replace('/^Alcatel OT-(.*)/', 'one touch $1', $s);
+			$s = preg_replace('/^YL-/', '', $s);
+			$s = preg_replace('/^Novo7 ?/i', 'Novo7 ', $s);
+			$s = preg_replace('/^G[iI]ONEE[ -]/', '', $s);
+			$s = preg_replace('/^HW-/', '', $s);
+			$s = preg_replace('/^Huawei[ -]/i', 'Huawei ', $s);
+			$s = preg_replace('/^SAMSUNG[ -]/i', '', $s);
+			$s = preg_replace('/^(Sony ?Ericsson|Sony)/', '', $s);
+			$s = preg_replace('/^(Lenovo Lenovo|LNV-Lenovo|LENOVO-Lenovo)/', 'Lenovo', $s);
+			$s = preg_replace('/^Lenovo-/', 'Lenovo', $s);
+			$s = preg_replace('/^ZTE-/', 'ZTE ', $s);
+			$s = preg_replace('/^(LG)[ _\/]/', '$1-', $s);
+			$s = preg_replace('/^(HTC.*)\s(?:v|V)?[0-9.]+$/', '$1', $s);
+			$s = preg_replace('/^(HTC)[-\/]/', '$1', $s);
+			$s = preg_replace('/^(HTC)([A-Z][0-9][0-9][0-9])/', '$1 $2', $s);
+			$s = preg_replace('/^(Motorola[\s|-])/', '', $s);
+			$s = preg_replace('/^(Moto|MOT-)/', '', $s);
+
+			$s = preg_replace('/-?(orange(-ls)?|vodafone|bouygues|parrot|Kust)$/i', '', $s);
+			$s = preg_replace('/http:\/\/.+$/i', '', $s);
+			$s = preg_replace('/^\s+|\s+$/', '', $s);
+			
+			return $s;
+		}
+	}
+
+	class Version {
+		var $value = null;
+	
+		function __construct($options = null) {
+			if (is_array($options)) {
+				if (isset($options['value'])) $this->value = $options['value'];
+				if (isset($options['alias'])) $this->alias = $options['alias'];
+				if (isset($options['details'])) $this->details = $options['details'];
+			}
+		}
+		
+		function toFloat() {
+			return floatval($this->value);
+		}
+
+		function toNumber() {
+			return intval($this->value);
+		}
+	}
+
+	class Detected {
+		
+		function __construct($headers) {
+			$this->headers = $headers;
+			
+			$this->browser = (object) array('stock' => true, 'hidden' => false, 'channel' => '', 'mode' => '');
+			$this->engine = (object) array();
+			$this->os = (object) array();
+			$this->device = (object) array('type' => '', 'identified' => false);
+		
+			$this->analyseUserAgent($this->headers['User-Agent']);
+			
+			if (isset($this->headers['X-OperaMini-Phone-UA'])) $this->analyseAlternativeUserAgent($this->headers['X-OperaMini-Phone-UA']);
+			if (isset($this->headers['X-UCBrowser-Phone-UA'])) $this->analyseUCUserAgent($this->headers['X-UCBrowser-Phone-UA']);
+			if (isset($this->headers['X-Puffin-UA'])) $this->analysePuffinUserAgent($this->headers['X-Puffin-UA']);
+
+			if (isset($this->headers['X-Original-User-Agent'])) $this->analyseAlternativeUserAgent($this->headers['X-Original-User-Agent']);
+			if (isset($this->headers['X-Device-User-Agent'])) $this->analyseAlternativeUserAgent($this->headers['X-Device-User-Agent']);
+			if (isset($this->headers['Device-Stock-UA'])) $this->analyseAlternativeUserAgent($this->headers['Device-Stock-UA']);
+		}
+		
+		function analyseAlternativeUserAgent($ua) {
+			$extra = new Detected(array("User-Agent" => $ua));
+			if ($extra->device->type != TYPE_DESKTOP) {
+				if (isset($extra->os->version)) $this->os = $extra->os;
+				if ($extra->device->identified) $this->device = $extra->device;
+			}
+		}
+
+		function analyseUCUserAgent($ua) {
+			if ($this->device->type == TYPE_DESKTOP) {
+				$this->device->type = TYPE_MOBILE;
+
+				unset($this->os->name);
+				unset($this->os->version);
+			}
+			if ($this->browser->name != 'UC Browser') {
+				$this->browser->name = 'UC Browser';
+				$this->browser->version = null;
+			}
+
+			$extra = new Detected(array("User-Agent" => $ua));
+			if ($extra->device->type != TYPE_DESKTOP) {
+				if (isset($extra->os->version)) $this->os = $extra->os;
+				if ($extra->device->identified) $this->device = $extra->device;
+			}
+		}
+				
+		function analysePuffinUserAgent($ua) {
+			$parts = explode('/', $ua);
+			
+			$this->device->type = 'mobile';
+			
+			if (count($parts) > 1 && $parts[0] == 'Android') {
+				if (!isset($this->os->name) || $this->os->name != 'Android') {
+					$this->os->name = 'Android';
+					$this->os->version = null;
+				}
+
+				$device = DeviceModels::identify('android', $parts[1]);
+				if ($device->identified) {
+					$this->device = $device;
+				}
+			}
+		}
+		
+		function analyseUserAgent($ua) {
+			
+			/****************************************************
+			 *		Unix
+			 */
+		
+			if (preg_match('/Unix/', $ua)) {
+				$this->os->name = 'Unix';
+			}
+			
+			/****************************************************
+			 *		FreeBSD
+			 */
+		
+			if (preg_match('/FreeBSD/', $ua)) {
+				$this->os->name = 'FreeBSD';
+			}
+			
+			/****************************************************
+			 *		OpenBSD
+			 */
+		
+			if (preg_match('/OpenBSD/', $ua)) {
+				$this->os->name = 'OpenBSD';
+			}
+			
+			/****************************************************
+			 *		NetBSD
+			 */
+		
+			if (preg_match('/NetBSD/', $ua)) {
+				$this->os->name = 'NetBSD';
+			}
+			
+			
+			/****************************************************
+			 *		Solaris
+			 */
+		
+			if (preg_match('/SunOS/', $ua)) {
+				$this->os->name = 'Solaris';
+			}
+			
+			
+			/****************************************************
+			 *		Syllable
+			 */
+		
+			if (preg_match('/Syllable/', $ua)) {
+				$this->os->name = 'Syllable';
+			}
+			
+			
+			/****************************************************
+			 *		Linux
+			 */
+		
+			if (preg_match('/Linux/', $ua)) {
+				$this->os->name = 'Linux';
+
+				if (preg_match('/CentOS/', $ua)) {
+					$this->os->name = 'CentOS';
+					if (preg_match('/CentOS\/[0-9\.\-]+el([0-9_]+)/', $ua, $match)) {
+						$this->os->version = new Version(array('value' => str_replace('_', '.', $match[1])));
+					}
+
+					$this->device->type = TYPE_DESKTOP;
+				}
+
+				if (preg_match('/Debian/', $ua)) {
+					$this->os->name = 'Debian';
+					$this->device->type = TYPE_DESKTOP;
+				}
+				
+				if (preg_match('/Fedora/', $ua)) {
+					$this->os->name = 'Fedora';
+					if (preg_match('/Fedora\/[0-9\.\-]+fc([0-9]+)/', $ua, $match)) {
+						$this->os->version = new Version(array('value' => str_replace('_', '.', $match[1])));
+					}
+
+					$this->device->type = TYPE_DESKTOP;
+				}
+
+				if (preg_match('/Gentoo/', $ua)) {
+					$this->os->name = 'Gentoo';
+					$this->device->type = TYPE_DESKTOP;
+				}
+				
+				if (preg_match('/Kubuntu/', $ua)) {
+					$this->os->name = 'Kubuntu';
+					$this->device->type = TYPE_DESKTOP;
+				}
+				
+				if (preg_match('/Mandriva Linux/', $ua)) {
+					$this->os->name = 'Mandriva';
+					if (preg_match('/Mandriva Linux\/[0-9\.\-]+mdv([0-9]+)/', $ua, $match)) {
+						$this->os->version = new Version(array('value' => $match[1]));
+					}
+
+					$this->device->type = TYPE_DESKTOP;
+				}
+
+				if (preg_match('/Mageia/', $ua)) {
+					$this->os->name = 'Mageia';
+					if (preg_match('/Mageia\/[0-9\.\-]+mga([0-9]+)/', $ua, $match)) {
+						$this->os->version = new Version(array('value' => $match[1]));
+					}
+
+					$this->device->type = TYPE_DESKTOP;
+				}
+
+				if (preg_match('/Red Hat/', $ua)) {
+					$this->os->name = 'Red Hat';
+					if (preg_match('/Red Hat[^\/]*\/[0-9\.\-]+el([0-9_]+)/', $ua, $match)) {
+						$this->os->version = new Version(array('value' => str_replace('_', '.', $match[1])));
+					}
+
+					$this->device->type = TYPE_DESKTOP;
+				}
+
+				if (preg_match('/Slackware/', $ua)) {
+					$this->os->name = 'Slackware';
+					$this->device->type = TYPE_DESKTOP;
+				}
+				
+				if (preg_match('/SUSE/', $ua)) {
+					$this->os->name = 'SUSE';
+					$this->device->type = TYPE_DESKTOP;
+				}
+				
+				if (preg_match('/Turbolinux/', $ua)) {
+					$this->os->name = 'Turbolinux';
+					$this->device->type = TYPE_DESKTOP;
+				}
+				
+				if (preg_match('/Ubuntu/', $ua)) {
+					$this->os->name = 'Ubuntu';
+					if (preg_match('/Ubuntu\/([0-9.]*)/', $ua, $match)) {
+						$this->os->version = new Version(array('value' => $match[1]));
+					}
+
+					$this->device->type = TYPE_DESKTOP;
+				}
+			}
+			
+			
+			/****************************************************
+			 *		iOS
+			 */
+		
+			if (preg_match('/iPhone( Simulator| 3G| 3GS| 4| 4S| 5)?;/', $ua) || preg_match('/iPad;/', $ua) || preg_match('/iPod( touch)?;/', $ua)) {
+				$this->os->name = 'iOS';
+				$this->os->version = new Version(array('value' => '1.0'));
+
+				if (preg_match('/OS (.*) like Mac OS X/', $ua, $match)) {
+					$this->os->version = new Version(array('value' => str_replace('_', '.', $match[1])));
+				}
+
+				if (preg_match('/iPhone Simulator;/', $ua)) {
+					$this->device->type = TYPE_EMULATOR;
+				} 
+				else if (preg_match('/iPod( touch)?;/', $ua)) {
+					$this->device->type = TYPE_MEDIA;
+					$this->device->manufacturer = 'Apple';
+					$this->device->model = 'iPod touch';
+				} 
+				else if (preg_match('/iPhone( 3G| 3GS| 4| 4S| 5)?;/', $ua, $match)) {
+					$this->device->type = TYPE_MOBILE;
+					$this->device->manufacturer = 'Apple';
+					$this->device->model = 'iPhone' . (isset($match[1]) ? $match[1] : '');
+				} 
+				else {
+					$this->device->type = TYPE_TABLET;
+					$this->device->manufacturer = 'Apple';
+					$this->device->model = 'iPad';
+				}
+				
+				$this->device->identified = true;
+				
+				if (preg_match('/((iPad|iPhone|iPod)[0-9],[0-9])/', $ua, $match)) {
+					$this->device->manufacturer = 'Apple';
+
+					switch($match[2]) {
+						case 'iPad': 		$this->device->type = TYPE_TABLET; break;	
+						case 'iPhone': 		$this->device->type = TYPE_MOBILE; break;	
+						case 'iPod': 		$this->device->type = TYPE_MEDIA; break;	
+					}
+					
+					switch($match[1]) {
+						case 'iPad1,1':
+						case 'iPad1,2':		$this->device->model = 'iPad'; break;
+						case 'iPad2,1':	
+						case 'iPad2,2':	
+						case 'iPad2,3':	
+						case 'iPad2,4':		$this->device->model = 'iPad 2'; break;
+						case 'iPad2,5':	
+						case 'iPad2,6':	
+						case 'iPad2,7':		$this->device->model = 'iPad mini'; break;
+						case 'iPad3,1':	
+						case 'iPad3,2':	
+						case 'iPad3,3':		$this->device->model = 'iPad (3rd gen)'; break;
+						case 'iPad3,4':	
+						case 'iPad3,5':	
+						case 'iPad3,6':		$this->device->model = 'iPad (4th gen)'; break;
+						
+						case 'iPhone1,1':	$this->device->model = 'iPhone'; break;
+						case 'iPhone1,2':	$this->device->model = 'iPhone 3G'; break;
+						case 'iPhone2,1':	$this->device->model = 'iPhone 3GS'; break;
+						case 'iPhone3,1':
+						case 'iPhone3,2':
+						case 'iPhone3,3':	$this->device->model = 'iPhone 4'; break;
+						case 'iPhone4,1':	$this->device->model = 'iPhone 4S'; break;
+						case 'iPhone5,1':
+						case 'iPhone5,2':	$this->device->model = 'iPhone 5'; break;
+						
+						case 'iPod1,1':		$this->device->model = 'iPod touch'; break;
+						case 'iPod2,1':		$this->device->model = 'iPod touch (2nd gen)'; break;
+						case 'iPod3,1':		$this->device->model = 'iPod touch (3rd gen)'; break;
+						case 'iPod4,1':		$this->device->model = 'iPod touch (4th gen)'; break;
+						case 'iPod5,1':		$this->device->model = 'iPod touch (5th gen)'; break;
+					}
+				}
+			}
+			
+			
+			/****************************************************
+			 *		OS X
+			 */
+		
+			else if (preg_match('/Mac OS X/', $ua)) {
+				$this->os->name = 'Mac OS X';
+
+				if (preg_match('/Mac OS X (10[0-9\._]*)/', $ua, $match)) {
+					$this->os->version = new Version(array('value' => str_replace('_', '.', $match[1])));
+				}
+
+				$this->device->type = TYPE_DESKTOP;
+			}
+
+
+			/****************************************************
+			 *		Windows
+			 */
+			 
+			if (preg_match('/Windows/', $ua)) {
+				$this->os->name = 'Windows';
+				$this->device->type = TYPE_DESKTOP;
+
+				if (preg_match('/Windows NT ([0-9]\.[0-9])/', $ua, $match)) {
+					$this->os->version = new Version(array('value' => $match[1]));
+					
+					switch($match[1]) {
+						case '6.2':		if (preg_match('/; ARM;/', $ua))
+											$this->os->version = new Version(array('value' => $match[1], 'alias' => 'RT')); 
+										else
+											$this->os->version = new Version(array('value' => $match[1], 'alias' => '8')); 
+										break;
+										
+						case '6.1':		$this->os->version = new Version(array('value' => $match[1], 'alias' => '7')); break;
+						case '6.0':		$this->os->version = new Version(array('value' => $match[1], 'alias' => 'Vista')); break;
+						case '5.2':		$this->os->version = new Version(array('value' => $match[1], 'alias' => 'Server 2003')); break;
+						case '5.1':		$this->os->version = new Version(array('value' => $match[1], 'alias' => 'XP')); break;
+						case '5.0':		$this->os->version = new Version(array('value' => $match[1], 'alias' => '2000')); break;
+						default:		$this->os->version = new Version(array('value' => $match[1], 'alias' => 'NT ' . $match[1])); break;
+					}
+				}
+				
+				if (preg_match('/Windows 95/', $ua) || preg_match('/Win95/', $ua) || preg_match('/Win 9x 4.00/', $ua)) {
+					$this->os->version = new Version(array('value' => '4.0', 'alias' => '95')); 
+				}
+
+				if (preg_match('/Windows 98/', $ua) || preg_match('/Win98/', $ua) || preg_match('/Win 9x 4.10/', $ua)) {
+					$this->os->version = new Version(array('value' => '4.1', 'alias' => '98')); 
+				}
+
+				if (preg_match('/Windows ME/', $ua) || preg_match('/WinME/', $ua) || preg_match('/Win 9x 4.90/', $ua)) {
+					$this->os->version = new Version(array('value' => '4.9', 'alias' => 'ME')); 
+				}
+
+				if (preg_match('/Windows XP/', $ua) || preg_match('/WinXP/', $ua)) {
+					$this->os->version = new Version(array('value' => '5.1', 'alias' => 'XP')); 
+				}
+
+				if (preg_match('/WPDesktop/', $ua)) {
+					$this->os->name = 'Windows Phone';
+					$this->os->version = new Version(array('value' => '8', 'details' => 1)); 
+					$this->device->type = TYPE_MOBILE;
+				}
+				
+				if (preg_match('/WP7/', $ua)) {
+					$this->os->name = 'Windows Phone';
+					$this->os->version = new Version(array('value' => '7', 'details' => 1)); 
+					$this->device->type = TYPE_MOBILE;
+					$this->browser->mode = 'desktop';
+				}
+
+				if (preg_match('/Windows CE/', $ua) || preg_match('/WinCE/', $ua) || preg_match('/WindowsCE/', $ua)) {
+					if (preg_match('/ IEMobile/', $ua)) {
+						$this->os->name = 'Windows Mobile';
+
+						if (preg_match('/ IEMobile 8/', $ua)) {
+							$this->os->version = new Version(array('value' => '6.5', 'details' => 2)); 
+						}
+	
+						if (preg_match('/ IEMobile 7/', $ua)) {
+							$this->os->version = new Version(array('value' => '6.1', 'details' => 2)); 
+						}
+	
+						if (preg_match('/ IEMobile 6/', $ua)) {
+							$this->os->version = new Version(array('value' => '6.0', 'details' => 2)); 
+						}
+					}
+					else {
+						$this->os->name = 'Windows CE';
+						
+						if (preg_match('/WindowsCEOS\/([0-9.]*)/', $ua, $match)) {
+							$this->os->version = new Version(array('value' => $match[1], 'details' => 2));
+						}
+	
+						if (preg_match('/Windows CE ([0-9.]*)/', $ua, $match)) {
+							$this->os->version = new Version(array('value' => $match[1], 'details' => 2));
+						}
+					}
+										
+					$this->device->type = TYPE_MOBILE;
+				}
+
+				if (preg_match('/Windows Mobile/', $ua)) {
+					$this->os->name = 'Windows Mobile';
+					$this->device->type = TYPE_MOBILE;
+				}
+
+				if (preg_match('/WindowsMobile\/([0-9.]*)/', $ua, $match)) {
+					$this->os->name = 'Windows Mobile';
+					$this->os->version = new Version(array('value' => $match[1], 'details' => 2));
+					$this->device->type = TYPE_MOBILE;
+				}
+
+				if (preg_match('/Windows Phone/', $ua)) {
+					$this->os->name = 'Windows Phone';
+					$this->device->type = TYPE_MOBILE;
+					
+					if (preg_match('/Windows Phone (?:OS )?([0-9.]*)/', $ua, $match)) {
+						$this->os->version = new Version(array('value' => $match[1], 'details' => 2));
+
+						if (intval($match[1]) < 7) {
+							$this->os->name = 'Windows Mobile';
+						}						
+					}
+					
+					if (preg_match('/IEMobile\/[^;]+;(?: ARM; Touch; )?([^;]+); ([^;]+)[;|\)]/', $ua, $match)) {
+						$this->device = DeviceModels::identify('wp', $match[2]);
+						
+						if (!$this->device->identified) {
+							$this->device->manufacturer = $match[1];
+							$this->device->model = $match[2];
+						}
+					}						
+
+					if ($this->device->manufacturer == 'Microsoft' && $this->device->model == 'XDeviceEmulator') {
+						$this->device->manufacturer = null;
+						$this->device->model = null;
+						$this->device->type = TYPE_EMULATOR;
+						$this->device->identified = true;
+					}
+				}
+			}
+
+
+
+			/****************************************************
+			 *		Android
+			 */
+		
+			if (preg_match('/Android/', $ua)) {
+				$this->os->name = 'Android';
+				$this->os->version = new Version(); 
+
+				if (preg_match('/Android(?: )?(?:AllPhone_|CyanogenMod_)?(?:\/)?v?([0-9.]+)/', str_replace('-update', ',', $ua), $match)) {
+					$this->os->version = new Version(array('value' => $match[1], 'details' => 3));
+				}
+				
+				if (preg_match('/Android [0-9][0-9].[0-9][0-9].[0-9][0-9]\(([^)]+)\);/', str_replace('-update', ',', $ua), $match)) {
+					$this->os->version = new Version(array('value' => $match[1], 'details' => 3));
+				}
+				
+				if (preg_match('/Android Eclair/', $ua)) {
+					$this->os->version = new Version(array('value' => '2.0', 'details' => 3));
+				}
+				
+				if (is_null($this->os->version)) {
+					if (preg_match('/Build\/CUPCAKE/', $ua)) $this->os->version = new Version(array('value' => '1.5', 'details' => 3));
+					if (preg_match('/Build\/DONUT/', $ua)) $this->os->version = new Version(array('value' => '1.6', 'details' => 3));
+					if (preg_match('/Build\/ECLAIR/', $ua)) $this->os->version = new Version(array('value' => '2.0', 'details' => 3));
+					if (preg_match('/Build\/FROYO/', $ua)) $this->os->version = new Version(array('value' => '2.2', 'details' => 3));
+					if (preg_match('/Build\/GINGERBREAD/', $ua)) $this->os->version = new Version(array('value' => '2.3', 'details' => 3));
+				}
+					
+				$this->device->type = TYPE_MOBILE;
+				if ($this->os->version->toFloat() >= 3) $this->device->type = TYPE_TABLET;
+				if ($this->os->version->toFloat() >= 4 && preg_match('/Mobile/', $ua)) $this->device->type = TYPE_MOBILE;
+
+
+				if (preg_match('/Eclair; (?:[a-zA-Z][a-zA-Z](?:[-_][a-zA-Z][a-zA-Z])?) Build\/([^\/]*)\//', $ua, $match)) {
+					$this->device->model = $match[1];
+				}
+				
+				else if (preg_match('/; ([^;]*[^;\s])\s+Build/', $ua, $match)) {
+					$this->device->model = $match[1];
+				}		
+				
+				else if (preg_match('/[a-zA-Z][a-zA-Z](?:[-_][a-zA-Z][a-zA-Z])?; ([^;]*[^;\s]);\s+Build/', $ua, $match)) {
+					$this->device->model = $match[1];
+				}		
+				
+				else if (preg_match('/\(([^;]+);U;Android\/[^;]+;[0-9]+\*[0-9]+;CTC\/2.0\)/', $ua, $match)) {
+					$this->device->model = $match[1];
+				}		
+				
+				else if (preg_match('/;\s?([^;]+);\s?[0-9]+\*[0-9]+;\s?CTC\/2.0/', $ua, $match)) {
+					$this->device->model = $match[1];
+				}		
+				
+				else if (preg_match('/Android [^;]+; (?:[a-zA-Z][a-zA-Z](?:[-_][a-zA-Z][a-zA-Z])?; )?([^)]+)\)/', $ua, $match)) {
+					if (!preg_match('/[a-zA-Z][a-zA-Z](?:[-_][a-zA-Z][a-zA-Z])?/', $ua)) {
+						$this->device->model = $match[1];
+					}
+				}	
+				
+				/* Sometimes we get a model name that starts with Android, in that case it is a mismatch and we should ignore it */
+				if (isset($this->device->model) && substr($this->device->model, 0, 7) == 'Android') {
+					$this->device->model = null;
+				}
+				
+				if (isset($this->device->model)) {
+					$this->device = DeviceModels::identify('android', $this->device->model);
+				}
+				
+				if (preg_match('/HP eStation/', $ua)) 	{ $this->device->manufacturer = 'HP'; $this->device->model = 'eStation'; $this->device->type = TYPE_TABLET; $this->device->identified = true; }
+				if (preg_match('/Pre\/1.0/', $ua)) 		{ $this->device->manufacturer = 'Palm'; $this->device->model = 'Pre'; $this->device->identified = true; }
+				if (preg_match('/Pre\/1.1/', $ua)) 		{ $this->device->manufacturer = 'Palm'; $this->device->model = 'Pre Plus'; $this->device->identified = true; }
+				if (preg_match('/Pre\/1.2/', $ua)) 		{ $this->device->manufacturer = 'Palm'; $this->device->model = 'Pre 2'; $this->device->identified = true; }
+				if (preg_match('/Pre\/3.0/', $ua)) 		{ $this->device->manufacturer = 'HP'; $this->device->model = 'Pre 3'; $this->device->identified = true; }
+				if (preg_match('/Pixi\/1.0/', $ua)) 	{ $this->device->manufacturer = 'Palm'; $this->device->model = 'Pixi'; $this->device->identified = true; }
+				if (preg_match('/Pixi\/1.1/', $ua)) 	{ $this->device->manufacturer = 'Palm'; $this->device->model = 'Pixi Plus'; $this->device->identified = true; }
+				if (preg_match('/P160UN?A?\/1.0/', $ua)) { $this->device->manufacturer = 'HP'; $this->device->model = 'Veer'; $this->device->identified = true; }
+			}
+
+
+
+			/****************************************************
+			 *		Aliyun OS
+			 */
+		
+			if (preg_match('/Aliyun/', $ua)) {
+				$this->os->name = 'Aliyun OS';
+				$this->os->version = new Version(); 
+
+				if (preg_match('/YunOs ([0-9.]+)/', $ua, $match)) {
+					$this->os->version = new Version(array('value' => $match[1], 'details' => 3));
+				}
+
+				if (preg_match('/AliyunOS ([0-9.]+)/', $ua, $match)) {
+					$this->os->version = new Version(array('value' => $match[1], 'details' => 3));
+				}
+
+				$this->device->type = TYPE_MOBILE;
+
+				if (preg_match('/; ([^;]*[^;\s])\s+Build/', $ua, $match)) {
+					$this->device->model = $match[1];
+				}
+				
+				if ($this->device->model) {
+					$this->device = DeviceModels::identify('android', $this->device->model);
+				}
+			}
+
+			if (preg_match('/Android/', $ua)) {
+				if (preg_match('/Android v(1.[0-9][0-9])_[0-9][0-9].[0-9][0-9]-/', $ua, $match)) {
+					$this->os->name = 'Aliyun OS';
+					$this->os->version = new Version(array('value' => $match[1], 'details' => 3));
+				}
+
+				if (preg_match('/Android (1.[0-9].[0-9].[0-9]+)-R?T/', $ua, $match)) {
+					$this->os->name = 'Aliyun OS';
+					$this->os->version = new Version(array('value' => $match[1], 'details' => 3));
+				}
+			}
+			
+
+
+			/****************************************************
+			 *		Google TV
+			 */
+		
+			if (preg_match('/GoogleTV/', $ua)) {
+				$this->os->name = 'Google TV';
+				
+				/*
+				if (preg_match('/Chrome\/5./', $ua)) {
+					$this->os->version = new Version(array('value' => '1'));
+				}
+
+				if (preg_match('/Chrome\/11./', $ua)) {
+					$this->os->version = new Version(array('value' => '2'));
+				}
+				*/
+
+				$this->device->type = TYPE_TELEVISION;
+			}
+
+
+
+			/****************************************************
+			 *		WoPhone
+			 */
+		
+			if (preg_match('/WoPhone/', $ua)) {
+				$this->os->name = 'WoPhone';
+
+				if (preg_match('/WoPhone\/([0-9\.]*)/', $ua, $match)) {
+					$this->os->version = new Version(array('value' => $match[1]));
+				}
+
+				$this->device->type = TYPE_MOBILE;
+			}
+			
+			/****************************************************
+			 *		BlackBerry
+			 */
+		
+			if (preg_match('/BlackBerry/', $ua) && !preg_match('/BlackBerry Runtime for Android Apps/', $ua)) {
+				$this->os->name = 'BlackBerry OS';
+				
+				if (!preg_match('/Opera/', $ua)) {
+					if (preg_match('/BlackBerry([0-9]*)\/([0-9.]*)/', $ua, $match)) {
+						$this->device->model = $match[1];
+						$this->os->version = new Version(array('value' => $match[2], 'details' => 2));
+					}
+					
+					if (preg_match('/; BlackBerry ([0-9]*);/', $ua, $match)) {
+						$this->device->model = $match[1];
+					}
+
+					if (preg_match('/; ([0-9]+)[^;\)]+\)/', $ua, $match)) {
+						$this->device->model = $match[1];
+					}
+					
+					if (preg_match('/Version\/([0-9.]*)/', $ua, $match)) {
+						$this->os->version = new Version(array('value' => $match[1], 'details' => 2));
+					}
+
+					if ($this->os->version->toFloat() >= 10) {
+						$this->os->name = 'BlackBerry';
+					}
+
+					if (isset($this->device->model)) {					
+						$this->device->model = DeviceModels::identify('blackberry', $this->device->model);
+					} else {
+						$this->device->model = 'BlackBerry';
+					}
+				} else {
+					$this->device->model = 'BlackBerry';
+				}
+
+				$this->device->manufacturer = 'RIM';
+				$this->device->type = TYPE_MOBILE;
+				$this->device->identified = true;
+			}
+			
+			if (preg_match('/\(BB(1[^;]+); ([^\)]+)\)/', $ua, $match)) {
+				$this->os->name = 'BlackBerry';
+				$this->os->version = new Version(array('value' => $match[1], 'details' => 2));
+				
+				$this->device->manufacturer = 'RIM';
+				$this->device->model = 'BlackBerry ' . $match[2];
+				$this->device->type = preg_match('/Mobile/', $ua) ? TYPE_MOBILE : TYPE_TABLET;
+				$this->device->identified = true;
+
+				if (preg_match('/Version\/([0-9.]*)/', $ua, $match)) {
+					$this->os->version = new Version(array('value' => $match[1], 'details' => 2));
+				}
+			}
+				
+			/****************************************************
+			 *		BlackBerry PlayBook
+			 */
+		
+			if (preg_match('/RIM Tablet OS ([0-9.]*)/', $ua, $match)) {
+				$this->os->name = 'BlackBerry Tablet OS';
+				$this->os->version = new Version(array('value' => $match[1], 'details' => 2));
+
+				$this->device->manufacturer = 'RIM';
+				$this->device->model = 'BlackBerry PlayBook';
+				$this->device->type = TYPE_TABLET;
+				$this->device->identified = true;
+			}
+
+			else if (preg_match('/PlayBook/', $ua)) {
+				if (preg_match('/Version\/([0-9.]*)/', $ua, $match)) {
+					$this->os->name = 'BlackBerry Tablet OS';
+					$this->os->version = new Version(array('value' => $match[1], 'details' => 2));
+
+					$this->device->manufacturer = 'RIM';
+					$this->device->model = 'BlackBerry PlayBook';
+					$this->device->type = TYPE_TABLET;
+					$this->device->identified = true;
+				}
+			}			
+				
+				
+			/****************************************************
+			 *		WebOS
+			 */
+		
+			if (preg_match('/(?:web|hpw)OS\/([0-9.]*)/', $ua, $match)) {
+				$this->os->name = 'webOS';
+				$this->os->version = new Version(array('value' => $match[1], 'details' => 2));
+				$this->device->type = preg_match('/Tablet/', $ua) ? TYPE_TABLET : TYPE_MOBILE;
+
+				if (preg_match('/Pre\/1.0/', $ua)) $this->device->model = 'Pre';
+				if (preg_match('/Pre\/1.1/', $ua)) $this->device->model = 'Pre Plus';
+				if (preg_match('/Pre\/1.2/', $ua)) $this->device->model = 'Pre 2';
+				if (preg_match('/Pre\/3.0/', $ua)) $this->device->model = 'Pre 3';
+				if (preg_match('/Pixi\/1.0/', $ua)) $this->device->model = 'Pixi';
+				if (preg_match('/Pixi\/1.1/', $ua)) $this->device->model = 'Pixi Plus';
+				if (preg_match('/P160UN?A?\/1.0/', $ua)) $this->device->model = 'Veer';
+				if (preg_match('/TouchPad\/1.0/', $ua)) $this->device->model = 'TouchPad';
+				if (isset($this->device->model)) $this->device->manufacturer = preg_match('/hpwOS/', $ua) ? 'HP' : 'Palm';
+				
+				if (preg_match('/Emulator\//', $ua) || preg_match('/Desktop\//', $ua)) {
+					$this->device->type = TYPE_EMULATOR;
+					$this->device->manufacturer = null;
+					$this->device->model = null;
+				}
+
+				$this->device->identified = true;
+			}
+				
+			/****************************************************
+			 *		S60
+			 */
+		
+			if (preg_match('/Symbian/', $ua) || preg_match('/Series[ ]?60/', $ua) || preg_match('/S60;/', $ua) || preg_match('/S60V/', $ua)) {
+				$this->os->name = 'Series60';
+				
+				if (preg_match('/SymbianOS\/9.1/', $ua) && !preg_match('/Series60/', $ua)) {
+					$this->os->version = new Version(array('value' => '3.0'));
+				}
+							
+				if (preg_match('/Series60\/([0-9.]*)/', $ua, $match)) {
+					$this->os->version = new Version(array('value' => $match[1]));
+				}
+							
+				if (preg_match('/S60V([0-9.]*)/', $ua, $match)) {
+					$this->os->version = new Version(array('value' => $match[1]));
+				}
+
+				if (preg_match('/Nokia([^\/;\)]+)[\/|;|\)]/', $ua, $match)) {
+					if ($match[1] != 'Browser') {
+						$this->device->manufacturer = 'Nokia';
+						$this->device->model = DeviceModels::cleanup($match[1]);
+						$this->device->identified = true;
+					}
+				}
+
+				if (preg_match('/Symbian; U; (?:Nokia)?([^;]+); [a-z][a-z]\-[a-z][a-z]/', $ua, $match)) {
+					$this->device->manufacturer = 'Nokia';
+					$this->device->model = DeviceModels::cleanup($match[1]);
+					$this->device->identified = true;
+				}
+
+				if (preg_match('/Vertu([^\/;]+)[\/|;]/', $ua, $match)) {
+					$this->device->manufacturer = 'Vertu';
+					$this->device->model = DeviceModels::cleanup($match[1]);
+					$this->device->identified = true;
+				}
+
+				if (preg_match('/Samsung\/([^;]*);/', $ua, $match)) {
+					$this->device->manufacturer = 'Samsung';
+					$this->device->model = DeviceModels::cleanup($match[1]);
+					$this->device->identified = true;
+				}
+
+				if (isset($this->device->model)) {
+					$device = DeviceModels::identify('s60', $this->device->model);
+					if ($device->identified) {
+						$this->device = $device;
+					}
+				}
+				
+				$this->device->type = TYPE_MOBILE;
+			}
+				
+			/****************************************************
+			 *		S40
+			 */
+		
+			if (preg_match('/Series40/', $ua)) {
+				$this->os->name = 'Series40';
+
+				if (preg_match('/Nokia([^\/]+)\//', $ua, $match)) {
+					$this->device->manufacturer = 'Nokia';
+					$this->device->model = DeviceModels::cleanup($match[1]);
+					$this->device->identified = true;
+				}
+
+				if (isset($this->device->model)) {
+					$device = DeviceModels::identify('s40', $this->device->model);
+					if ($device->identified) {
+						$this->device = $device;
+					}
+				}
+				
+				$this->device->type = TYPE_MOBILE;
+			}
+			
+			/****************************************************
+			 *		MeeGo
+			 */
+		
+			if (preg_match('/MeeGo/', $ua)) {
+				$this->os->name = 'MeeGo';
+				$this->device->type = TYPE_MOBILE;
+
+				if (preg_match('/Nokia([^\)]+)\)/', $ua, $match)) {
+					$this->device->manufacturer = 'Nokia';
+					$this->device->model = DeviceModels::cleanup($match[1]);
+					$this->device->identified = true;
+				}
+			}
+			
+			/****************************************************
+			 *		Maemo
+			 */
+		
+			if (preg_match('/Maemo/', $ua)) {
+				$this->os->name = 'Maemo';
+				$this->device->type = TYPE_MOBILE;
+
+				if (preg_match('/(N[0-9]+)/', $ua, $match)) {
+					$this->device->manufacturer = 'Nokia';
+					$this->device->model = $match[1];
+					$this->device->identified = true;
+				}
+			}
+			
+			/****************************************************
+			 *		Tizen
+			 */
+		
+			if (preg_match('/Tizen/', $ua)) {
+				$this->os->name = 'Tizen';
+
+				if (preg_match('/Tizen[\/ ]([0-9.]*)/', $ua, $match)) {
+					$this->os->version = new Version(array('value' => $match[1]));
+				}
+
+				$this->device->type = TYPE_MOBILE;
+
+				if (preg_match('/\(([^;]+); ([^\/]+)\//', $ua, $match)) {
+					if ($match[1] != 'Linux') {
+						$this->device = DeviceModels::identify('tizen', $match[2]);
+
+						if (!$this->device->identified) {
+							$this->device->manufacturer = $match[1];
+							$this->device->model = $match[2];
+						}
+					}						
+				}
+
+				if (preg_match('/;\s+([^;\)]+)\)/', $ua, $match)) {
+					$this->device = DeviceModels::identify('tizen', $match[1]);
+
+					if (!$this->device->identified) {
+						$this->device->model = $match[1];
+					}
+				}
+			}
+			
+			/****************************************************
+			 *		Bada
+			 */
+		
+			if (preg_match('/[b|B]ada/', $ua)) {
+				$this->os->name = 'Bada';
+
+				if (preg_match('/[b|B]ada[\/ ]([0-9.]*)/', $ua, $match)) {
+					$this->os->version = new Version(array('value' => $match[1], 'details' => 2));
+				}
+
+				$this->device->type = TYPE_MOBILE;
+
+				if (preg_match('/\(([^;]+); ([^\/]+)\//', $ua, $match)) {
+					if ($match[1] != 'Bada') {
+						$this->device = DeviceModels::identify('bada', $match[2]);
+	
+						if (!$this->device->identified) {
+							$this->device->manufacturer = $match[1];
+							$this->device->model = $match[2];
+						}
+					}
+				}
+			}
+			
+			/****************************************************
+			 *		Brew
+			 */
+		
+			if (preg_match('/BREW/i', $ua) || preg_match('/BMP; U/', $ua)) {
+				$this->os->name = 'Brew';
+
+				if (preg_match('/BREW; U; ([0-9.]*)/i', $ua, $match)) {
+					$this->os->version = new Version(array('value' => $match[1]));
+				}
+
+				else if (preg_match('/;BREW\/([0-9.]*)/i', $ua, $match)) {
+					$this->os->version = new Version(array('value' => $match[1]));
+				}
+
+				$this->device->type = TYPE_MOBILE;
+
+				if (preg_match('/\(([^;]+);U;REX\/[^;]+;BREW\/[^;]+;(?:.*;)?[0-9]+\*[0-9]+;CTC\/2.0\)/', $ua, $match)) {
+					$this->device = DeviceModels::identify('brew', $match[1]);
+
+					if (!$this->device->identified) {
+						$this->device->model = $match[1];
+					}
+				}
+			}			
+			
+			/****************************************************
+			 *		MTK
+			 */
+		
+			if (preg_match('/\(MTK;/', $ua)) {
+				$this->os->name = 'MTK';
+				$this->device->type = TYPE_MOBILE;
+			}
+
+			/****************************************************
+			 *		CrOS
+			 */
+		
+			if (preg_match('/CrOS/', $ua)) {
+				$this->os->name = 'Chrome OS';
+				$this->device->type = TYPE_DESKTOP;
+			}
+			
+			/****************************************************
+			 *		Joli OS
+			 */
+		
+			if (preg_match('/Joli OS\/([0-9.]*)/i', $ua, $match)) {
+				$this->os->name = 'Joli OS';
+				$this->os->version = new Version(array('value' => $match[1]));
+				$this->device->type = TYPE_DESKTOP;
+			}
+			
+			/****************************************************
+			 *		Haiku
+			 */
+		
+			if (preg_match('/Haiku/', $ua)) {
+				$this->os->name = 'Haiku';
+				$this->device->type = TYPE_DESKTOP;
+			}
+			
+			/****************************************************
+			 *		QNX
+			 */
+		
+			if (preg_match('/QNX/', $ua)) {
+				$this->os->name = 'QNX';
+				$this->device->type = TYPE_MOBILE;
+			}
+			
+			/****************************************************
+			 *		OS/2 Warp
+			 */
+		
+			if (preg_match('/OS\/2; Warp ([0-9.]*)/i', $ua, $match)) {
+				$this->os->name = 'OS/2 Warp';
+				$this->os->version = new Version(array('value' => $match[1]));
+				$this->device->type = TYPE_DESKTOP;
+			}
+			
+			/****************************************************
+			 *		Grid OS
+			 */
+		
+			if (preg_match('/Grid OS ([0-9.]*)/i', $ua, $match)) {
+				$this->os->name = 'Grid OS';
+				$this->os->version = new Version(array('value' => $match[1]));
+				$this->device->type = TYPE_TABLET;
+			}
+
+			/****************************************************
+			 *		AmigaOS
+			 */
+		
+			if (preg_match('/AmigaOS ([0-9.]*)/i', $ua, $match)) {
+				$this->os->name = 'AmigaOS';
+				$this->os->version = new Version(array('value' => $match[1]));
+				$this->device->type = TYPE_DESKTOP;
+			}
+
+			/****************************************************
+			 *		MorphOS
+			 */
+		
+			if (preg_match('/MorphOS ([0-9.]*)/i', $ua, $match)) {
+				$this->os->name = 'MorphOS';
+				$this->os->version = new Version(array('value' => $match[1]));
+				$this->device->type = TYPE_DESKTOP;
+			}
+			
+			/****************************************************
+			 *		Kindle
+			 */
+		
+			if (preg_match('/Kindle/', $ua) && !preg_match('/Fire/', $ua)) {
+				$this->os->name = '';
+
+				$this->device->manufacturer = 'Amazon';
+				$this->device->model = 'Kindle';
+				$this->device->type = TYPE_EREADER;
+
+				if (preg_match('/Kindle\/2.0/', $ua)) $this->device->model = 'Kindle 2';
+				if (preg_match('/Kindle\/3.0/', $ua)) $this->device->model = 'Kindle 3 or later';
+
+				$this->device->identified = true;
+			}
+
+			/****************************************************
+			 *		NOOK
+			 */
+		
+			if (preg_match('/nook browser/', $ua)) {
+				$this->os->name = 'Android';
+				
+				$this->device->manufacturer = 'Barnes & Noble';
+				$this->device->model = 'NOOK';
+				$this->device->type = TYPE_EREADER;
+				$this->device->identified = true;
+			}
+			
+			/****************************************************
+			 *		Bookeen
+			 */
+		
+			if (preg_match('/bookeen\/cybook/', $ua)) {
+				$this->os->name = '';
+
+				$this->device->manufacturer = 'Bookeen';
+				$this->device->model = 'Cybook';
+				$this->device->type = TYPE_EREADER;
+				
+				if (preg_match('/Orizon/', $ua)) $this->device->model = 'Cybook Orizon';
+
+				$this->device->identified = true;
+			}
+
+			/****************************************************
+			 *		Sony Reader
+			 */
+		
+			if (preg_match('/EBRD1101/', $ua)) {
+				$this->os->name = '';
+				
+				$this->device->manufacturer = 'Sony';
+				$this->device->model = 'Reader';
+				$this->device->type = TYPE_EREADER;
+				$this->device->identified = true;
+			}
+
+			/****************************************************
+			 *		iRiver
+			 */
+		
+			if (preg_match('/Iriver ;/', $ua)) {
+				$this->os->name = '';
+		
+				$this->device->manufacturer = 'iRiver';
+				$this->device->model = 'Story';
+				$this->device->type = TYPE_EREADER;
+				
+				if (preg_match('/EB07/', $ua)) $this->device->model = 'Story HD EB07';
+
+				$this->device->identified = true;
+			}
+
+			/****************************************************
+			 *		Nintendo
+			 *
+			 *		Opera/9.30 (Nintendo Wii; U; ; 3642; en)
+			 *		Opera/9.30 (Nintendo Wii; U; ; 2047-7; en)
+			 *		Opera/9.50 (Nintendo DSi; Opera/507; U; en-US)
+			 *		Mozilla/5.0 (Nintendo 3DS; U; ; en) Version/1.7455.US
+			 *		Mozilla/5.0 (Nintendo 3DS; U; ; en) Version/1.7455.EU
+			 *		Mozilla/5.0 (Nintendo WiiU) AppleWebKit/534.52 (KHTML, like Gecko) NX/2.1.0.8.8 Version/1.0.0.6760.JP
+			 */
+		
+			if (preg_match('/Nintendo Wii/', $ua)) {
+				$this->os->name = '';
+		
+				$this->device->manufacturer = 'Nintendo';
+				$this->device->model = 'Wii';
+				$this->device->type = TYPE_GAMING;
+				$this->device->identified = true;
+			}
+			
+			if (preg_match('/Nintendo Wii ?U/', $ua)) {
+				$this->os->name = '';
+		
+				$this->device->manufacturer = 'Nintendo';
+				$this->device->model = 'Wii U';
+				$this->device->type = TYPE_GAMING;
+				$this->device->identified = true;
+			}
+
+			if (preg_match('/Nintendo DSi/', $ua)) {
+				$this->os->name = '';
+		
+				$this->device->manufacturer = 'Nintendo';
+				$this->device->model = 'DSi';
+				$this->device->type = TYPE_GAMING;
+				$this->device->identified = true;
+			}
+
+			if (preg_match('/Nintendo 3DS/', $ua)) {
+				$this->os->name = '';
+		
+				if (preg_match('/Version\/([0-9.]*)/', $ua, $match)) {
+					$this->os->version = new Version(array('value' => $match[1]));
+				}
+
+				$this->device->manufacturer = 'Nintendo';
+				$this->device->model = '3DS';
+				$this->device->type = TYPE_GAMING;
+				$this->device->identified = true;
+			}
+			
+			/****************************************************
+			 *		Sony Playstation
+			 *
+			 *		Mozilla/4.0 (PSP (PlayStation Portable); 2.00)
+			 *
+			 *		Mozilla/5.0 (PlayStation Vita 1.00) AppleWebKit/531.22.8 (KHTML, like Gecko) Silk/3.2
+			 *		Mozilla/5.0 (PlayStation Vita 1.50) AppleWebKit/531.22.8 (KHTML, like Gecko) Silk/3.2
+			 *		Mozilla/5.0 (PlayStation Vita 1.51) AppleWebKit/531.22.8 (KHTML, like Gecko) Silk/3.2
+			 *		Mozilla/5.0 (PlayStation Vita 1.52) AppleWebKit/531.22.8 (KHTML, like Gecko) Silk/3.2
+			 *		Mozilla/5.0 (PlayStation Vita 1.60) AppleWebKit/531.22.8 (KHTML, like Gecko) Silk/3.2
+			 *		Mozilla/5.0 (PlayStation Vita 1.61) AppleWebKit/531.22.8 (KHTML, like Gecko) Silk/3.2
+			 *		Mozilla/5.0 (PlayStation Vita 1.80) AppleWebKit/531.22.8 (KHTML, like Gecko) Silk/3.2
+			 *
+			 *		Mozilla/5.0 (PLAYSTATION 3; 1.00)
+			 *		Mozilla/5.0 (PLAYSTATION 3; 2.00)
+			 *		Mozilla/5.0 (PLAYSTATION 3; 3.55)
+			 *		Mozilla/5.0 (PLAYSTATION 3 4.11) AppleWebKit/531.22.8 (KHTML, like Gecko)
+			 *		Mozilla/5.0 (PLAYSTATION 3 4.10) AppleWebKit/531.22.8 (KHTML, like Gecko)
+			 *
+			 *		Mozilla/5.0 (PlayStation 3) SonyComputerEntertainmentEurope/531.3 (NCell) NuantiMeta/2.0
+			 */
+		
+			if (preg_match('/PlayStation Portable/', $ua)) {
+				$this->os->name = '';
+		
+				$this->device->manufacturer = 'Sony';
+				$this->device->model = 'Playstation Portable';
+				$this->device->type = TYPE_GAMING;
+				$this->device->identified = true;
+			}
+
+			if (preg_match('/PlayStation Vita ([0-9.]*)/', $ua, $match)) {
+				$this->os->name = '';
+				$this->os->version = new Version(array('value' => $match[1]));
+		
+				$this->device->manufacturer = 'Sony';
+				$this->device->model = 'Playstation Vita';
+				$this->device->type = TYPE_GAMING;
+				$this->device->identified = true;
+			}
+
+			if (preg_match('/PlayStation 3/i', $ua)) {
+				$this->os->name = '';
+
+				if (preg_match('/PLAYSTATION 3;? ([0-9.]*)/', $ua, $match)) {
+					$this->os->version = new Version(array('value' => $match[1]));
+				}
+				
+				$this->device->manufacturer = 'Sony';
+				$this->device->model = 'Playstation 3';
+				$this->device->type = TYPE_GAMING;
+				$this->device->identified = true;
+			}
+
+			/****************************************************
+			 *		XBox
+			 *
+			 *		Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0; Xbox)
+			 */
+		
+			if (preg_match('/Xbox\)$/', $ua, $match)) {
+				$this->os->name = '';
+				$this->os->version = null;
+		
+				$this->device->manufacturer = 'Microsoft';
+				$this->device->model = 'Xbox 360';
+				$this->device->type = TYPE_GAMING;
+				$this->device->identified = true;
+			}
+
+
+			/****************************************************
+			 *		Panasonic Smart Viera
+			 *
+			 *		Mozilla/5.0 (FreeBSD; U; Viera; ja-JP) AppleWebKit/535.1 (KHTML, like Gecko) Viera/1.2.4 Chrome/14.0.835.202 Safari/535.1
+			 */
+		
+			if (preg_match('/Viera/', $ua)) {
+				$this->os->name = '';
+				$this->device->manufacturer = 'Panasonic';
+				$this->device->model = 'Smart Viera';
+				$this->device->type = TYPE_TELEVISION;
+				$this->device->identified = true;
+			}
+
+
+			/****************************************************
+			 *		Sharp AQUOS TV
+			 *
+			 *		Mozilla/5.0 (DTV) AppleWebKit/531.2  (KHTML, like Gecko) AQUOSBrowser/1.0 (US00DTV;V;0001;0001)
+			 *		Mozilla/5.0 (DTV) AppleWebKit/531.2+ (KHTML, like Gecko) Espial/6.0.4 AQUOSBrowser/1.0 (CH00DTV;V;0001;0001)
+			 *		Opera/9.80 (Linux armv6l; U; en) Presto/2.8.115 Version/11.10 AQUOS-AS/1.0 LC-40LE835X
+			 */
+		
+			if (preg_match('/AQUOSBrowser/', $ua) || preg_match('/AQUOS-AS/', $ua)) {
+				$this->os->name = '';
+				$this->device->manufacturer = 'Sharp';
+				$this->device->model = 'Aquos TV';
+				$this->device->type = TYPE_TELEVISION;
+				$this->device->identified = true;
+			}
+
+
+			/****************************************************
+			 *		Samsung Smart TV
+			 *
+			 *		Mozilla/5.0 (SmartHub; SMART-TV; U; Linux/SmartTV; Maple2012) AppleWebKit/534.7 (KHTML, like Gecko) SmartTV Safari/534.7
+			 *		Mozilla/5.0 (SmartHub; SMART-TV; U; Linux/SmartTV) AppleWebKit/531.2+ (KHTML, like Gecko) WebBrowser/1.0 SmartTV Safari/531.2+
+			 */
+
+			if (preg_match('/SMART-TV/', $ua)) {
+				$this->os->name = '';
+				$this->device->manufacturer = 'Samsung';
+				$this->device->model = 'Smart TV';
+				$this->device->type = TYPE_TELEVISION;
+				$this->device->identified = true;
+
+				if (preg_match('/Maple([0-9]*)/', $ua, $match)) {
+					$this->device->model .= ' ' . $match[1];
+				}
+			}
+
+
+			/****************************************************
+			 *		Sony Internet TV
+			 *
+			 *		Opera/9.80 (Linux armv7l; U; InettvBrowser/2.2(00014A;SonyDTV115;0002;0100) KDL-46EX640; CC/USA; en) Presto/2.8.115 Version/11.10
+			 *		Opera/9.80 (Linux armv7l; U; InettvBrowser/2.2(00014A;SonyDTV115;0002;0100) KDL-40EX640; CC/USA; en) Presto/2.10.250 Version/11.60
+			 *		Opera/9.80 (Linux armv7l; U; InettvBrowser/2.2(00014A;SonyDTV115;0002;0100) N/A; CC/USA; en) Presto/2.8.115 Version/11.10
+			 *		Opera/9.80 (Linux mips; U; InettvBrowser/2.2 (00014A;SonyDTV115;0002;0100) ; CC/JPN; en) Presto/2.9.167 Version/11.50
+			 *		Opera/9.80 (Linux mips; U; InettvBrowser/2.2 (00014A;SonyDTV115;0002;0100) AZ2CVT2; CC/CAN; en) Presto/2.7.61 Version/11.00
+			 *		Opera/9.80 (Linux armv6l; Opera TV Store/4207; U; (SonyBDP/BDV11); en) Presto/2.9.167 Version/11.50
+			 *		Opera/9.80 (Linux armv6l ; U; (SonyBDP/BDV11); en) Presto/2.6.33 Version/10.60
+			 *		Opera/9.80 (Linux armv6l; U; (SonyBDP/BDV11); en) Presto/2.8.115 Version/11.10
+			 */
+
+			if (preg_match('/SonyDTV|SonyBDP|SonyCEBrowser/', $ua)) {
+				$this->os->name = '';
+				$this->device->manufacturer = 'Sony';
+				$this->device->model = 'Internet TV';
+				$this->device->type = TYPE_TELEVISION;
+				$this->device->identified = true;
+			}
+
+			/****************************************************
+			 *		Philips Net TV
+			 *
+			 *		Opera/9.70 (Linux armv6l ; U; CE-HTML/1.0 NETTV/2.0.2; en) Presto/2.2.1
+			 *		Opera/9.80 (Linux armv6l ; U; CE-HTML/1.0 NETTV/3.0.1;; en) Presto/2.6.33 Version/10.60
+			 *		Opera/9.80 (Linux mips; U; CE-HTML/1.0 NETTV/3.0.1; PHILIPS-AVM-2012; en) Presto/2.9.167 Version/11.50
+			 *		Opera/9.80 (Linux mips ; U; HbbTV/1.1.1 (; Philips; ; ; ; ) CE-HTML/1.0 NETTV/3.1.0; en) Presto/2.6.33 Version/10.70
+			 *		Opera/9.80 (Linux i686; U; HbbTV/1.1.1 (; Philips; ; ; ; ) CE-HTML/1.0 NETTV/3.1.0; en) Presto/2.9.167 Version/11.50
+			 */
+
+			if (preg_match('/NETTV\//', $ua)) {
+				$this->os->name = '';
+				$this->device->manufacturer = 'Philips';
+				$this->device->model = 'Net TV';
+				$this->device->type = TYPE_TELEVISION;
+				$this->device->identified = true;
+			}
+			
+			/****************************************************
+			 *		LG NetCast TV
+			 *
+			 *		Mozilla/5.0 (DirectFB; Linux armv7l) AppleWebKit/534.26+ (KHTML, like Gecko) Version/5.0 Safari/534.26+ LG Browser/5.00.00(+mouse+3D+SCREEN+TUNER; LGE; GLOBAL-PLAT4; 03.09.22; 0x00000001;); LG NetCast.TV-2012
+			 *		Mozilla/5.0 (DirectFB; Linux armv7l) AppleWebKit/534.26+ (KHTML, like Gecko) Version/5.0 Safari/534.26+ LG Browser/5.00.00(+SCREEN+TUNER; LGE; GLOBAL-PLAT4; 01.00.00; 0x00000001;); LG NetCast.TV-2012
+			 *		Mozilla/5.0 (DirectFB; U; Linux armv6l; en) AppleWebKit/531.2  (KHTML, like Gecko) Safari/531.2  LG Browser/4.1.4( BDP; LGE; Media/BD660; 6970; abc;); LG NetCast.Media-2011
+			 *		Mozilla/5.0 (DirectFB; U; Linux 7631; en) AppleWebKit/531.2  (KHTML, like Gecko) Safari/531.2  LG Browser/4.1.4( NO_NUM; LGE; Media/SP520; ST.3.97.409.F; 0x00000001;); LG NetCast.Media-2011
+			 *		Mozilla/5.0 (DirectFB; U; Linux 7630; en) AppleWebKit/531.2  (KHTML, like Gecko) Safari/531.2  LG Browser/4.1.4( 3D BDP NO_NUM; LGE; Media/ST600; LG NetCast.Media-2011
+			 *		(LGSmartTV/1.0) AppleWebKit/534.23 OBIGO-T10/2.0
+			 */
+
+			if (preg_match('/LG NetCast\.(?:TV|Media)-([0-9]*)/', $ua, $match)) {
+				$this->os->name = '';
+				$this->device->manufacturer = 'LG';
+				$this->device->model = 'NetCast TV ' . $match[1];
+				$this->device->type = TYPE_TELEVISION;
+				$this->device->identified = true;
+			}
+
+			if (preg_match('/LGSmartTV/', $ua)) {
+				$this->os->name = '';
+				$this->device->manufacturer = 'LG';
+				$this->device->model = 'Smart TV';
+				$this->device->type = TYPE_TELEVISION;
+				$this->device->identified = true;
+			}
+
+			/****************************************************
+			 *		Toshiba Smart TV
+			 *
+			 *		Mozilla/5.0 (Linux mipsel; U; HbbTV/1.1.1 (; TOSHIBA; DTV_RL953; 56.7.66.7; t12; ) ; ToshibaTP/1.3.0 (+VIDEO_MP4+VIDEO_X_MS_ASF+AUDIO_MPEG+AUDIO_MP4+DRM+NATIVELAUNCH) ; en) AppleWebKit/534.1 (KHTML, like Gecko)
+			 *		Mozilla/5.0 (DTV; TSBNetTV/T32013713.0203.7DD; TVwithVideoPlayer; like Gecko) NetFront/4.1 DTVNetBrowser/2.2 (000039;T32013713;0203;7DD) InettvBrowser/2.2 (000039;T32013713;0203;7DD)
+			 *		Mozilla/5.0 (Linux mipsel; U; HbbTV/1.1.1 (; TOSHIBA; 40PX200; 0.7.3.0.; t12; ) ; Toshiba_TP/1.3.0 (+VIDEO_MP4+AUDIO_MPEG+AUDIO_MP4+VIDEO_X_MS_ASF+OFFLINEAPP) ; en) AppleWebKit/534.1 (KHTML, like Gec
+			 */
+
+			if (preg_match('/Toshiba_?TP\//', $ua) || preg_match('/TSBNetTV\//', $ua)) {
+				$this->os->name = '';
+				$this->device->manufacturer = 'Toshiba';
+				$this->device->model = 'Smart TV';
+				$this->device->type = TYPE_TELEVISION;
+				$this->device->identified = true;
+			}
+
+			/****************************************************
+			 *		NetRange MMH 
+			 */
+
+			if (preg_match('/NETRANGEMMH/', $ua)) {
+				$this->os->name = '';
+				$this->os->version = null;
+				$this->browser->name = '';
+				$this->browser->version = null;
+				$this->device->model = 'NetRange MMH';
+				$this->device->type = TYPE_TELEVISION;
+				$this->device->identified = true;
+			}
+
+			/****************************************************
+			 *		MachBlue XT
+			 */
+
+			if (preg_match('/mbxtWebKit\/([0-9.]*)/', $ua, $match)) {
+				$this->os->name = '';
+				$this->browser->name = 'MachBlue XT';
+				$this->browser->version = new Version(array('value' => $match[1], 'details' => 2));
+				$this->device->type = TYPE_TELEVISION;
+			}
+
+			if ($ua == 'MachBlue') {
+				$this->os->name = '';
+				$this->browser->name = 'MachBlue XT';
+				$this->device->type = TYPE_TELEVISION;
+			}
+			
+
+			/****************************************************
+			 *		Motorola KreaTV
+			 */
+
+			if (preg_match('/Motorola KreaTV STB/', $ua)) {
+				$this->os->name = '';
+				$this->device->manufacturer = 'Motorola';
+				$this->device->model = 'KreaTV';
+				$this->device->type = TYPE_TELEVISION;
+				$this->device->identified = true;
+			}
+
+			/****************************************************
+			 *		ADB
+			 */
+
+			if (preg_match('/\(ADB; ([^\)]+)\)/', $ua, $match)) {
+				$this->os->name = '';
+				$this->device->manufacturer = 'ADB';
+				$this->device->model = ($match[1] != 'Unknown' ? str_replace('ADB', '', $match[1]) . ' ' : '') . 'IPTV receiver';
+				$this->device->type = TYPE_TELEVISION;
+				$this->device->identified = true;
+			}
+
+			/****************************************************
+			 *		MStar
+			 */
+
+			if (preg_match('/Mstar;OWB/', $ua)) {
+				$this->os->name = '';
+				$this->device->manufacturer = 'MStar';
+				$this->device->model = 'PVR';
+				$this->device->type = TYPE_TELEVISION;
+				$this->device->identified = true;
+
+				$this->browser->name = 'Origyn Web Browser';
+			}
+
+			/****************************************************
+			 *		TechniSat
+			 */
+
+			if (preg_match('/\TechniSat ([^;]+);/', $ua, $match)) {
+				$this->os->name = '';
+				$this->device->manufacturer = 'TechniSat';
+				$this->device->model = $match[1];
+				$this->device->type = TYPE_TELEVISION;
+				$this->device->identified = true;
+			}
+			
+			/****************************************************
+			 *		Technicolor
+			 */
+
+			if (preg_match('/\Technicolor_([^;]+);/', $ua)) {
+				$this->os->name = '';
+				$this->device->manufacturer = 'Technicolor';
+				$this->device->model = $match[1];
+				$this->device->type = TYPE_TELEVISION;
+				$this->device->identified = true;
+			}
+
+			/****************************************************
+			 *		Winbox Evo2
+			 */
+
+			if (preg_match('/Winbox Evo2/', $ua)) {
+				$this->os->name = '';
+				$this->device->manufacturer = 'Winbox';
+				$this->device->model = 'Evo2';
+				$this->device->type = TYPE_TELEVISION;
+				$this->device->identified = true;
+			}
+
+			/****************************************************
+			 *		Roku
+			 */
+
+			if (preg_match('/^Roku\/DVP-([0-9]+)/', $ua, $match)) {
+				$this->os->name = '';
+				$this->device->manufacturer = 'Roku';
+				$this->device->type = TYPE_TELEVISION;
+
+				switch ($match[1]) {
+					case '2000':	$this->device->model = 'HD'; break;
+					case '2050':	$this->device->model = 'XD'; break;
+					case '2100':	$this->device->model = 'XDS'; break;
+					case '2400':	$this->device->model = 'LT'; break;
+					case '3000':	$this->device->model = '2 HD'; break;
+					case '3050':	$this->device->model = '2 XD'; break;
+					case '3100':	$this->device->model = '2 XS'; break;
+				}
+
+				$this->device->identified = true;
+			}
+
+
+			/****************************************************
+			 *		Generic
+			 */
+
+			if (preg_match('/HbbTV\/1.1.1 \([^;]*;\s*([^;]*)\s*;\s*([^;]*)\s*;/', $ua, $match)) {
+				$vendorName = trim($match[1]);
+				$modelName = trim($match[2]);
+
+				if (!isset($this->device->manufacturer) && $vendorName != '' && $vendorName != 'vendorName') {
+					switch($vendorName) {
+						case 'LG Electronics':	$this->device->manufacturer = 'LG'; break;
+						case 'LGE':				$this->device->manufacturer = 'LG'; break;
+						case 'TOSHIBA':			$this->device->manufacturer = 'Toshiba'; break;
+						case 'smart':			$this->device->manufacturer = 'Smart'; break;
+						case 'tv2n':			$this->device->manufacturer = 'TV2N'; break;
+						default:				$this->device->manufacturer = $vendorName;
+					}
+
+					if (!isset($this->device->model) && $modelName != '' && $modelName != 'modelName') {
+						switch(modelName) {
+							case 'GLOBAL_PLAT3':	$this->device->model = 'NetCast TV'; break;
+							case 'GLOBAL_PLAT4':	$this->device->model = 'NetCast TV'; break;
+							case 'SmartTV2012':		$this->device->model = 'Smart TV 2012'; break;
+							case 'videoweb':		$this->device->model = 'Videoweb'; break;
+							default:				$this->device->model = $modelName;
+						}
+						
+						if ($vendorName == 'Humax') {
+							$this->device->model = strtoupper($this->device->model);
+						}
+	
+						$this->device->identified = true;
+						$this->os->name = '';
+					}
+				}
+
+				$this->device->type = TYPE_TELEVISION;
+			}
+			
+			/****************************************************
+			 *		Detect type based on common identifiers
+			 */
+
+			if (preg_match('/InettvBrowser/', $ua)) {
+				$this->device->type = TYPE_TELEVISION;
+			}
+
+			if (preg_match('/MIDP/', $ua)) {
+				$this->device->type = TYPE_MOBILE;
+			}
+			
+			/****************************************************
+			 *		Try to detect any devices based on common
+			 *		locations of model ids
+			 */
+
+			if (!isset($this->device->model) && !isset($this->device->manufacturer)) {
+				$candidates = array();
+				
+				if (!preg_match('/^(Mozilla|Opera)/', $ua)) if (preg_match('/^(?:MQQBrowser\/[0-9\.]+\/)?([^\s]+)/', $ua, $match)) {
+					$match[1] = preg_replace('/_TD$/', '', $match[1]);
+					$match[1] = preg_replace('/_CMCC$/', '', $match[1]);
+					$match[1] = preg_replace('/[_ ]Mozilla$/', '', $match[1]);
+					$match[1] = preg_replace('/ Linux$/', '', $match[1]);
+					$match[1] = preg_replace('/ Opera$/', '', $match[1]);
+					$match[1] = preg_replace('/\/[0-9].*$/', '', $match[1]);
+
+					array_push($candidates, $match[1]);
+				}
+			
+				if (preg_match('/^((?:SAMSUNG|TCL|ZTE) [^\s]+)/', $ua, $match)) {
+					array_push($candidates, $match[1]);
+				}
+
+				if (preg_match('/[0-9]+x[0-9]+; ([^;]+)/', $ua, $match)) {
+					array_push($candidates, $match[1]);
+				}
+
+				if (preg_match('/\s*([^;]*[^\s])\s*; [0-9]+\*[0-9]+\)/', $ua, $match)) {
+					array_push($candidates, $match[1]);
+				}
+				
+				if (preg_match('/[0-9]+X[0-9]+ ([^;\/\(\)]+)/', $ua, $match)) {
+					array_push($candidates, $match[1]);
+				}
+
+				if (preg_match('/Windows NT 5.1; ([^;]+); Windows Phone/', $ua, $match)) {
+					array_push($candidates, $match[1]);
+				}
+
+				if (preg_match('/\) PPC; (?:[0-9]+x[0-9]+; )?([^;\/\(\)]+)/', $ua, $match)) {
+					array_push($candidates, $match[1]);
+				}
+
+				if (preg_match('/Windows Mobile; ([^;]+); PPC;/', $ua, $match)) {
+					array_push($candidates, $match[1]);
+				}
+
+				if (preg_match('/\(([^;]+); U; Windows Mobile/', $ua, $match)) {
+					array_push($candidates, $match[1]);
+				}
+
+				if (preg_match('/Series60\/[0-9\.]+ ([^\s]+) Profile/', $ua, $match)) {
+					array_push($candidates, $match[1]);
+				}
+
+				if (preg_match('/Vodafone\/1.0\/([^\/]+)/', $ua, $match)) {
+					array_push($candidates, $match[1]);
+				}
+
+				if (preg_match('/\ ([^\s]+)$/', $ua, $match)) {
+					array_push($candidates, $match[1]);
+				}
+				
+				if (preg_match('/; ([^;\)]+)\)/', $ua, $match)) {
+					array_push($candidates, $match[1]);
+				}
+				
+				if (preg_match('/^(.*)\/UCWEB/', $ua, $match)) {
+					array_push($candidates, $match[1]);
+				}
+				
+				if (preg_match('/^([a-z0-9\.\_\+\/ ]+) Linux/i', $ua, $match)) {
+					array_push($candidates, $match[1]);
+				}
+				
+				if (preg_match('/\(([a-z0-9\.\_\+\/ ]+) Browser/i', $ua, $match)) {
+					array_push($candidates, $match[1]);
+				}
+				
+				if (isset($this->os->name)) {
+					for ($i = 0; $i < count($candidates); $i++) {
+						$result = false;
+	
+						if (!isset($this->device->model) && !isset($this->device->manufacturer)) {
+							if (isset($this->os->name) && ($this->os->name == 'Android' || $this->os->name == 'Linux')) {
+								$device = DeviceModels::identify('android', $candidates[$i]);
+								if ($device->identified) {
+									$result = true;
+	
+									$this->device = $device;
+
+									if ($this->os->name != 'Android') {
+										$this->os->name = 'Android';
+										$this->os->version = null;
+									}
+								}
+							}
+		
+							if (!isset($this->os->name) || $this->os->name == 'Windows' || $this->os->name == 'Windows Mobile' || $this->os->name == 'Windows CE') {
+								$device = DeviceModels::identify('wm', $candidates[$i]);
+								if ($device->identified) {
+									$result = true;
+	
+									$this->device = $device;
+
+									if (isset($this->os->name) && $this->os->name != 'Windows Mobile') {
+										$this->os->name = 'Windows Mobile';
+										$this->os->version = null;
+									}
+								}
+							}
+						}
+					}
+				}
+				
+				if (!isset($this->device->model) && !isset($this->device->manufacturer)) {
+					$identified = false;
+					
+					for ($i = 0; $i < count($candidates); $i++) {
+						if (preg_match('/^(?:YL-)?COOLPAD([^\s]+)/i', $candidates[$i], $match)) {
+							$this->device->manufacturer = 'Coolpad';
+							$this->device->model = DeviceModels::cleanup($match[1]);
+							$this->device->type = TYPE_MOBILE;
+							$identified = true;
+						}
+						
+						if (preg_match('/^dopod[-_]?([^\s]+)/i', $candidates[$i], $match)) {
+							$this->device->manufacturer = 'Dopod';
+							$this->device->model = DeviceModels::cleanup($match[1]);
+							$this->device->type = TYPE_MOBILE;
+							$identified = true;
+						}
+						
+						if (preg_match('/^GIONEE[-_]([^\s]+)/i', $candidates[$i], $match)) {
+							$this->device->manufacturer = 'Gionee';
+							$this->device->model = DeviceModels::cleanup($match[1]);
+							$this->device->type = TYPE_MOBILE;
+							$identified = true;
+						}
+						
+						if (preg_match('/^HTC[_-]?([^\/_]+)(?:\/|_|$)/i', $candidates[$i], $match)) {
+							$this->device->manufacturer = 'HTC';
+							$this->device->model = DeviceModels::cleanup($match[1]);
+							$this->device->type = TYPE_MOBILE;
+							$identified = true;
+						}
+
+						if (preg_match('/^HUAWEI[_-]?([^\/]*)/i', $candidates[$i], $match)) {
+							$this->device->manufacturer = 'Huawei';
+							$this->device->model = DeviceModels::cleanup($match[1]);
+							$this->device->type = TYPE_MOBILE;
+							$identified = true;
+						}
+
+						if (preg_match('/^KONKA[-_]?([^\s]+)/i', $candidates[$i], $match)) {
+							$this->device->manufacturer = 'Konka';
+							$this->device->model = DeviceModels::cleanup($match[1]);
+							$this->device->type = TYPE_MOBILE;
+							$identified = true;
+						}
+						
+						if (preg_match('/^Lenovo-([^\/]*)/i', $candidates[$i], $match)) {
+							$this->device->manufacturer = 'Lenovo';
+							$this->device->model = DeviceModels::cleanup($match[1]);
+							$this->device->type = TYPE_MOBILE;
+							$identified = true;
+						}
+
+						if (preg_match('/^Lephone_([^\/]*)/i', $candidates[$i], $match)) {
+							$this->device->manufacturer = 'Lephone';
+							$this->device->model = DeviceModels::cleanup($match[1]);
+							$this->device->type = TYPE_MOBILE;
+							$identified = true;
+						}
+
+						if (preg_match('/(?:^|\()LGE?(?:\/|-|_|\s)([^\s]*)/i', $candidates[$i], $match)) {
+							$this->device->manufacturer = 'LG';
+							$this->device->model = DeviceModels::cleanup($match[1]);
+							$this->device->type = TYPE_MOBILE;
+							$identified = true;
+						}
+
+						if (preg_match('/^MOT-([^\/_]+)(?:\/|_|$)/i', $candidates[$i], $match)) {
+							$this->device->manufacturer = 'Motorola';
+							$this->device->model = DeviceModels::cleanup($match[1]);
+							$this->device->type = TYPE_MOBILE;
+							$identified = true;
+						}
+						
+						if (preg_match('/^Motorola_([^\/_]+)(?:\/|_|$)/i', $candidates[$i], $match)) {
+							$this->device->manufacturer = 'Motorola';
+							$this->device->model = DeviceModels::cleanup($match[1]);
+							$this->device->type = TYPE_MOBILE;
+							$identified = true;
+						}
+
+						if (preg_match('/^Nokia-?([^\/]+)(?:\/|$)/i', $candidates[$i], $match)) {
+							$this->device->manufacturer = 'Nokia';
+							$this->device->model = DeviceModels::cleanup($match[1]);
+							$this->device->type = TYPE_MOBILE;
+							$identified = true;
+							
+							if (!$this->device->identified) {
+								$device = DeviceModels::identify('s60', $this->device->model);
+								if ($device->identified) {
+									$this->device = $device;
+									$this->os->name = 'Series60';
+								}
+							}
+
+							if (!$this->device->identified) {
+								$device = DeviceModels::identify('s40', $this->device->model);
+								if ($device->identified) {
+									$this->device = $device;
+									$this->os->name = 'Series40';
+								}
+							}
+						}
+
+						if (preg_match('/^Pantech([^\/_]+)(?:\/|_|$)/i', $candidates[$i], $match)) {
+							$this->device->manufacturer = 'Pantech';
+							$this->device->model = DeviceModels::cleanup($match[1]);
+							$this->device->type = TYPE_MOBILE;
+							$identified = true;
+						}
+						
+						if (preg_match('/^SonyEricsson([^\/_]+)(?:\/|_|$)/i', $candidates[$i], $match)) {
+							$this->device->manufacturer = 'Sony Ericsson';
+							$this->device->model = DeviceModels::cleanup($match[1]);
+							$this->device->type = TYPE_MOBILE;
+							$identified = true;
+
+							if (isset($this->os->name) && $this->os->name == 'Series60') {
+								$device = DeviceModels::identify('s60', $this->device->model);
+								if ($device->identified) {
+									$this->device = $device;
+								}
+							}
+						}
+
+						if (preg_match('/^TCL[-_ ]([^\/]*)/i', $candidates[$i], $match)) {
+							$this->device->manufacturer = 'TCL';
+							$this->device->model = DeviceModels::cleanup($match[1]);
+							$this->device->type = TYPE_MOBILE;
+							$identified = true;
+						}
+						
+						if (preg_match('/^SHARP[-_\/]([^\/]*)/i', $candidates[$i], $match)) {
+							$this->device->manufacturer = 'Sharp';
+							$this->device->model = DeviceModels::cleanup($match[1]);
+							$this->device->type = TYPE_MOBILE;
+							$identified = true;
+						}
+		
+						if (preg_match('/^SAMSUNG[-\/ ]?([^\/_]+)(?:\/|_|$)/i', $candidates[$i], $match)) {
+							$this->device->manufacturer = 'Samsung';
+							$this->device->model = DeviceModels::cleanup($match[1]);
+							$this->device->type = TYPE_MOBILE;
+							$identified = true;
+						
+							if (isset($this->os->name) && $this->os->name == 'Bada') {
+								$device = DeviceModels::identify('bada', $this->device->model);
+								if ($device->identified) {
+									$this->device = $device;
+								}
+							}
+							
+							else if (isset($this->os->name) && $this->os->name == 'Series60') {
+								$device = DeviceModels::identify('s60', $this->device->model);
+								if ($device->identified) {
+									$this->device = $device;
+								}
+							}
+							
+							else if (preg_match('/Jasmine\/([0-9.]*)/', $ua, $match)) {
+								$version = $match[1];
+								
+								$device = DeviceModels::identify('touchwiz', $this->device->model);
+								if ($device->identified) {
+									$this->device = $device;
+									$this->os->name = 'Touchwiz';
+									
+									switch($version) {
+										case '0.8':		$this->os->version = new Version(array('value' => '1.0')); break;
+										case '1.0':		$this->os->version = new Version(array('value' => '2.0', 'alias' => '2.0 or earlier')); break;
+										case '2.0':		$this->os->version = new Version(array('value' => '3.0')); break;
+									}	
+								}
+							}
+				
+							else if (preg_match('/(?:Dolfin\/([0-9.]*)|Browser\/Dolfin([0-9.]*))/', $ua, $match)) {
+								$version = $match[1] || $match[2];
+
+								$device = DeviceModels::identify('bada', $this->device->model);
+								if ($device->identified) {
+									$this->device = $device;
+									$this->os->name = 'Bada';
+									
+									switch($version) {
+										case '2.0':		$this->os->version = new Version(array('value' => '1.0')); break;
+										case '2.2':		$this->os->version = new Version(array('value' => '1.2')); break;
+										case '3.0':		$this->os->version = new Version(array('value' => '2.0')); break;
+									}	
+								}
+
+								else {
+									$device = DeviceModels::identify('touchwiz', $this->device->model);
+									if ($device->identified) {
+										$this->device = $device;
+										$this->os->name = 'Touchwiz';
+										
+										switch($version) {
+											case '1.5':		$this->os->version = new Version(array('value' => '2.0')); break;
+											case '2.0':		$this->os->version = new Version(array('value' => '3.0')); break;
+										}	
+									}
+								}
+							}
+						}
+
+						if (preg_match('/^ZTE[-_]?([^\s]+)/i', $candidates[$i], $match)) {
+							$this->device->manufacturer = 'ZTE';
+							$this->device->model = DeviceModels::cleanup($match[1]);
+							$this->device->type = TYPE_MOBILE;
+							$identified = true;
+						}
+					}
+					
+					if ($identified && !$this->device->identified) {
+						if (!$this->device->identified) {
+							$device = DeviceModels::identify('bada', $this->device->model);
+							if ($device->identified) {
+								$this->device = $device;
+								$this->os->name = 'Bada';
+							}
+						}
+													
+						if (!$this->device->identified) {
+							$device = DeviceModels::identify('touchwiz', $this->device->model);
+							if ($device->identified) {
+								$this->device = $device;
+								$this->os->name = 'Touchwiz';
+							}
+						}
+													
+						if (!$this->device->identified) {
+							$device = DeviceModels::identify('wp', $this->device->model);
+							if ($device->identified) {
+								$this->device = $device;
+								$this->os->name = 'Windows Phone';
+							}
+						}
+													
+						if (!$this->device->identified) {
+							$device = DeviceModels::identify('wm', $this->device->model);
+							if ($device->identified) {
+								$this->device = $device;
+								$this->os->name = 'Windows Mobile';
+							}
+						}
+													
+						if (!$this->device->identified) {
+							$device = DeviceModels::identify('android', $this->device->model);
+							if ($device->identified) {
+								$this->device = $device;
+								$this->os->name = 'Android';
+							}
+						}
+						
+						if (!$this->device->identified) {
+							$device = DeviceModels::identify('feature', $this->device->model);
+							if ($device->identified) {
+								$this->device = $device;
+							}
+						}
+					}
+
+					if ($identified && !$this->device->identified) {
+						if (!$this->device->identified) {
+							$device = DeviceModels::identify('bada', $this->device->manufacturer . ' ' . $this->device->model);
+							if ($device->identified) {
+								$this->device = $device;
+								$this->os->name = 'Bada';
+							}
+						}
+													
+						if (!$this->device->identified) {
+							$device = DeviceModels::identify('touchwiz', $this->device->manufacturer . ' ' . $this->device->model);
+							if ($device->identified) {
+								$this->device = $device;
+								$this->os->name = 'Touchwiz';
+							}
+						}
+													
+						if (!$this->device->identified) {
+							$device = DeviceModels::identify('wp', $this->device->manufacturer . ' ' . $this->device->model);
+							if ($device->identified) {
+								$this->device = $device;
+								$this->os->name = 'Windows Phone';
+							}
+						}
+													
+						if (!$this->device->identified) {
+							$device = DeviceModels::identify('wm', $this->device->manufacturer . ' ' . $this->device->model);
+							if ($device->identified) {
+								$this->device = $device;
+								$this->os->name = 'Windows Mobile';
+							}
+						}
+													
+						if (!$this->device->identified) {
+							$device = DeviceModels::identify('android', $this->device->manufacturer . ' ' . $this->device->model);
+							if ($device->identified) {
+								$this->device = $device;
+								$this->os->name = 'Android';
+							}
+						}
+						
+						if (!$this->device->identified) {
+							$device = DeviceModels::identify('feature', $this->device->manufacturer . ' ' . $this->device->model);
+							if ($device->identified) {
+								$this->device = $device;
+							}
+						}					}
+											
+					if ($identified && !$this->device->identified) {
+						$this->device->identified = true;
+					}
+				}
+			}
+			
+
+			if (preg_match('/SoftBank\/[^\/]+\/([^\/]+)\//', $ua, $match)) {
+				$this->device->manufacturer = 'Softbank';
+				$this->device->model = DeviceModels::cleanup($match[1]);
+				$this->device->type = TYPE_MOBILE;
+				$this->device->identified = true;
+			}
+
+			if (preg_match('/\((?:LG[-|\/])(.*) (?:Browser\/)?AppleWebkit/', $ua, $match)) {
+				$this->device->manufacturer = 'LG';
+				$this->device->model = DeviceModels::cleanup($match[1]);
+				$this->device->type = TYPE_MOBILE;
+				$this->device->identified = true;
+			}
+
+			if (preg_match('/^Mozilla\/5.0 \((?:Nokia|NOKIA)(?:\s?)([^\)]+)\)UC AppleWebkit\(like Gecko\) Safari\/530$/', $ua, $match)) {
+				$this->device->manufacturer = 'Nokia';
+				$this->device->model = DeviceModels::cleanup($match[1]);
+				$this->device->type = TYPE_MOBILE;
+				$this->device->identified = true;
+
+				if (!$this->device->identified) {
+					$device = DeviceModels::identify('s60', $this->device->model);
+					if ($device->identified) {
+						$this->device = $device;
+						$this->os->name = 'Series60';
+					}
+				}
+
+				if (!$this->device->identified) {
+					$device = DeviceModels::identify('s40', $this->device->model);
+					if ($device->identified) {
+						$this->device = $device;
+						$this->os->name = 'Series40';
+					}
+				}
+			}
+
+					
+			
+			/****************************************************
+			 *		Safari
+			 */
+		
+			if (preg_match('/Safari/', $ua)) {
+				
+				if (isset($this->os->name) && $this->os->name == 'iOS') {
+					$this->browser->stock = true;
+					$this->browser->hidden = true;
+					$this->browser->name = 'Safari';
+					$this->browser->version = null;
+				}
+				
+				if (isset($this->os->name) && ($this->os->name == 'Mac OS X' || $this->os->name == 'Windows')) {
+					$this->browser->name = 'Safari';
+					$this->browser->stock = $this->os->name == 'Mac OS X';
+
+					if (preg_match('/Version\/([0-9\.]+)/', $ua, $match)) {
+						$this->browser->version = new Version(array('value' => $match[1]));
+					}		
+
+					if (preg_match('/AppleWebKit\/[0-9\.]+\+/', $ua)) {
+						$this->browser->name = 'WebKit Nightly Build';
+						$this->browser->version = null;
+					}
+				}
+			}
+
+			/****************************************************
+			 *		Internet Explorer
+			 */
+		
+			if (preg_match('/MSIE/', $ua)) {
+				$this->browser->name = 'Internet Explorer';
+				
+				if (preg_match('/IEMobile/', $ua) || preg_match('/Windows CE/', $ua) || preg_match('/Windows Phone/', $ua) || preg_match('/WP7/', $ua) || preg_match('/WPDesktop/', $ua)) {
+					$this->browser->name = 'Mobile Internet Explorer';
+				}
+
+				if (preg_match('/MSIE ([0-9.]*)/', $ua, $match)) {
+					$this->browser->version = new Version(array('value' => $match[1]));
+				}
+			}
+
+			/****************************************************
+			 *		Opera
+			 */
+		
+			if (preg_match('/Opera/i', $ua)) {
+				$this->browser->stock = false;
+				$this->browser->name = 'Opera';
+
+				if (preg_match('/Opera[\/| ]([0-9.]*)/', $ua, $match)) {
+					$this->browser->version = new Version(array('value' => $match[1]));
+				}
+
+				if (preg_match('/Version\/([0-9.]*)/', $ua, $match)) {
+					if (floatval($match[1]) >= 10)
+						$this->browser->version = new Version(array('value' => $match[1]));
+					else
+						$this->browser->version = null;
+				}
+
+				if (is_array($this->browser->version) && preg_match('/Edition Labs/', $ua)) {
+					$this->browser->channel = 'Labs';
+				}
+				
+				if (is_array($this->browser->version) && preg_match('/Edition Next/', $ua)) {
+					$this->browser->channel = 'Next';
+				}
+				
+				if (preg_match('/Opera Tablet/', $ua)) {
+					$this->browser->name = 'Opera Mobile';
+					$this->device->type = TYPE_TABLET;
+				}
+				
+				if (preg_match('/Opera Mobi/', $ua)) {
+					$this->browser->name = 'Opera Mobile';
+					$this->device->type = TYPE_MOBILE;
+				}
+
+				if (preg_match('/Opera Mini;/', $ua)) {
+					$this->browser->name = 'Opera Mini';
+					$this->browser->version = null;
+					$this->browser->mode = 'proxy';
+					$this->device->type = TYPE_MOBILE;
+				}
+				
+				if (preg_match('/Opera Mini\/(?:att\/)?([0-9.]*)/', $ua, $match)) {
+					$this->browser->name = 'Opera Mini';
+					$this->browser->version = new Version(array('value' => $match[1], 'details' => (intval(substr(strrchr($match[1], '.'), 1)) > 99 ? -1 : null)));
+					$this->browser->mode = 'proxy';
+					$this->device->type = TYPE_MOBILE;
+				}
+				
+				if ($this->browser->name == 'Opera' && $this->device->type == TYPE_MOBILE) {
+					$this->browser->name = 'Opera Mobile';
+					
+					if (preg_match('/BER/', $ua)) {
+						$this->browser->name = 'Opera Mini';
+						$this->browser->version = null;
+					}
+				}
+
+				if (preg_match('/InettvBrowser/', $ua)) {
+					$this->device->type = TYPE_TELEVISION;
+				}
+
+				if (preg_match('/Opera[ -]TV/', $ua)) {
+					$this->browser->name = 'Opera';
+					$this->device->type = TYPE_TELEVISION;
+				}
+
+				if (preg_match('/Linux zbov/', $ua)) {
+					$this->browser->name = 'Opera Mobile';
+					$this->browser->mode = 'desktop';
+
+					$this->device->type = TYPE_MOBILE;
+
+					$this->os->name = null;
+					$this->os->version = null;
+				}
+
+				if (preg_match('/Linux zvav/', $ua)) {
+					$this->browser->name = 'Opera Mini';
+					$this->browser->version = null;
+					$this->browser->mode = 'desktop';
+
+					$this->device->type = TYPE_MOBILE;
+
+					$this->os->name = null;
+					$this->os->version = null;
+				}
+				
+				if ($this->device->type == '') {
+					$this->device->type = TYPE_DESKTOP;
+				}
+			}
+
+			/****************************************************
+			 *		Firefox
+			 */
+		
+			if (preg_match('/Firefox/', $ua)) {
+				$this->browser->stock = false;
+				$this->browser->name = 'Firefox';
+
+				if (preg_match('/Firefox\/([0-9ab.]*)/', $ua, $match)) {
+					$this->browser->version = new Version(array('value' => $match[1]));
+					
+					if (preg_match('/a/', $match[1])) {
+						$this->browser->channel = 'Aurora';
+					}
+
+					if (preg_match('/b/', $match[1])) {
+						$this->browser->channel = 'Beta';
+					}
+				}
+
+				if (preg_match('/Fennec/', $ua)) {
+					$this->device->type = TYPE_MOBILE;
+				}
+				
+				if (preg_match('/Mobile; rv/', $ua)) {
+					$this->device->type = TYPE_MOBILE;
+				}
+
+				if (preg_match('/Tablet; rv/', $ua)) {
+					$this->device->type = TYPE_TABLET;
+				}
+				
+				if ($this->device->type == TYPE_MOBILE || $this->device->type == TYPE_TABLET) {
+					$this->browser->name = 'Firefox Mobile';
+				}
+
+				if ($this->device->type == '') {
+					$this->device->type = TYPE_DESKTOP;
+				}
+			}
+
+			if (preg_match('/Namoroka/', $ua)) {
+				$this->browser->stock = false;
+				$this->browser->name = 'Firefox';
+
+				if (preg_match('/Namoroka\/([0-9ab.]*)/', $ua, $match)) {
+					$this->browser->version = new Version(array('value' => $match[1]));
+				}
+
+				$this->browser->channel = 'Namoroka';
+			}
+
+			if (preg_match('/Shiretoko/', $ua)) {
+				$this->browser->stock = false;
+				$this->browser->name = 'Firefox';
+
+				if (preg_match('/Shiretoko\/([0-9ab.]*)/', $ua, $match)) {
+					$this->browser->version = new Version(array('value' => $match[1]));
+				}
+				
+				$this->browser->channel = 'Shiretoko';
+			}
+			
+			if (preg_match('/Minefield/', $ua)) {
+				$this->browser->stock = false;
+				$this->browser->name = 'Firefox';
+
+				if (preg_match('/Minefield\/([0-9ab.]*)/', $ua, $match)) {
+					$this->browser->version = new Version(array('value' => $match[1]));
+				}
+
+				$this->browser->channel = 'Minefield';
+			}
+			
+			if (preg_match('/Firebird/', $ua)) {
+				$this->browser->stock = false;
+				$this->browser->name = 'Firebird';
+
+				if (preg_match('/Firebird\/([0-9ab.]*)/', $ua, $match)) {
+					$this->browser->version = new Version(array('value' => $match[1]));
+				}
+			}
+			
+			/****************************************************
+			 *		SeaMonkey
+			 */
+		
+			if (preg_match('/SeaMonkey/', $ua)) {
+				$this->browser->stock = false;
+				$this->browser->name = 'SeaMonkey';
+
+				if (preg_match('/SeaMonkey\/([0-9ab.]*)/', $ua, $match)) {
+					$this->browser->version = new Version(array('value' => $match[1]));
+				}
+
+				if ($this->device->type == '') {
+					$this->device->type = TYPE_DESKTOP;
+				}
+			}
+
+			/****************************************************
+			 *		Netscape
+			 */
+		
+			if (preg_match('/Netscape/', $ua)) {
+				$this->browser->stock = false;
+				$this->browser->name = 'Netscape';
+
+				if (preg_match('/Netscape[0-9]?\/([0-9.]*)/', $ua, $match)) {
+					$this->browser->version = new Version(array('value' => $match[1]));
+				}
+			}
+
+			/****************************************************
+			 *		Konqueror
+			 */
+		
+			if (preg_match('/[k|K]onqueror\//', $ua)) {
+				$this->browser->name = 'Konqueror';
+
+				if (preg_match('/[k|K]onqueror\/([0-9.]*)/', $ua, $match)) {
+					$this->browser->version = new Version(array('value' => $match[1]));
+				}
+
+				if ($this->device->type == '') {
+					$this->device->type = TYPE_DESKTOP;
+				}
+			}
+
+			/****************************************************
+			 *		Chrome
+			 */
+		
+			if (preg_match('/(?:Chrome|CrMo|CriOS)\/([0-9.]*)/', $ua, $match)) {
+				$this->browser->stock = false;
+				$this->browser->name = 'Chrome';
+				$this->browser->version = new Version(array('value' => $match[1]));
+
+				if ($this->os->name == 'Android') {
+					switch (implode('.', array_splice(explode('.', $match[1]), 0, 3))) {
+						case '16.0.912':
+							$this->browser->channel = 'Beta';
+							break;
+						case '18.0.1025':
+							$this->browser->version->details = 1;
+							break;
+						default:	
+							$this->browser->channel = 'Nightly';
+							break;
+					}
+				}
+								
+				else {
+					switch (implode('.', array_splice(explode('.', $match[1]), 0, 3))) {
+						case '0.2.149':
+						case '0.3.154':
+						case '0.4.154':
+						case '4.1.249':
+							$this->browser->version->details = 2;
+							break;
+						
+						case '1.0.154':
+						case '2.0.172':
+						case '3.0.195':
+						case '4.0.249':
+						case '5.0.375':
+						case '6.0.472':
+						case '7.0.517':
+						case '8.0.552':
+						case '9.0.597':
+						case '10.0.648':
+						case '11.0.696':
+						case '12.0.742':
+						case '13.0.782':
+						case '14.0.835':
+						case '15.0.874':
+						case '16.0.912':
+						case '17.0.963':
+						case '18.0.1025':
+						case '19.0.1084':
+						case '20.0.1132':
+						case '21.0.1180':
+						case '22.0.1229':
+						case '23.0.1271':
+						case '24.0.1312':
+							$this->browser->version->details = 1;
+							break;
+						default:	
+							$this->browser->channel = 'Nightly';
+							break;
+					}
+				}
+
+				if ($this->device->type == '') {
+					$this->device->type = TYPE_DESKTOP;
+				}
+			}
+			
+			/****************************************************
+			 *		Chromium
+			 */
+		
+			if (preg_match('/Chromium/', $ua)) {
+				$this->browser->stock = false;
+				$this->browser->channel = '';
+				$this->browser->name = 'Chromium';
+
+				if (preg_match('/Chromium\/([0-9.]*)/', $ua, $match)) {
+					$this->browser->version = new Version(array('value' => $match[1]));
+				}
+
+				if ($this->device->type == '') {
+					$this->device->type = TYPE_DESKTOP;
+				}
+			}	
+			
+			
+			/****************************************************
+			 *		wOSBrowser
+			 */
+		
+			if (preg_match('/wOSBrowser/', $ua)) {
+				$this->browser->name = 'webOS Browser';
+				
+				if ($this->os->name != 'webOS') {
+					$this->os->name = 'webOS';
+				}
+			}
+
+			/****************************************************
+			 *		BrowserNG
+			 */
+		
+			if (preg_match('/BrowserNG/', $ua)) {
+				$this->browser->name = 'Nokia Browser';
+
+				if (preg_match('/BrowserNG\/([0-9.]*)/', $ua, $match)) {
+					$this->browser->version = new Version(array('value' => $match[1], 'details' => 3, 'builds' => false));
+				}
+			}	
+
+			/****************************************************
+			 *		Nokia Browser
+			 */
+		
+			if (preg_match('/NokiaBrowser/', $ua)) {
+				$this->browser->name = 'Nokia Browser';
+
+				if (preg_match('/NokiaBrowser\/([0-9.]*)/', $ua, $match)) {
+					$this->browser->version = new Version(array('value' => $match[1], 'details' => 3));
+				}
+			}	
+			
+			/****************************************************
+			 *		Nokia Xpress
+			 *
+			 *		Mozilla/5.0 (X11; Linux x86_64; rv:5.0.1) Gecko/20120822 OSRE/1.0.7f
+			 */
+			
+			if (preg_match('/OSRE/', $ua)) {
+				$this->browser->name = 'Nokia Xpress';
+				$this->browser->mode = 'proxy';
+				$this->device->type = TYPE_MOBILE;
+
+				$this->os->name = null;
+				$this->os->version = null;
+			}
+
+			if (preg_match('/S40OviBrowser/', $ua)) {
+				$this->browser->name = 'Nokia Xpress';
+				$this->browser->mode = 'proxy';
+
+				if (preg_match('/S40OviBrowser\/([0-9.]*)/', $ua, $match)) {
+					$this->browser->version = new Version(array('value' => $match[1], 'details' => 3));
+				}
+	
+				if (preg_match('/Nokia([^\/]+)\//', $ua, $match)) {
+					$this->device->manufacturer = 'Nokia';
+					$this->device->model = $match[1];
+					$this->device->identified = true;
+	
+					$device = DeviceModels::identify('s40', $this->device->model);
+					if ($device->identified) {
+						$this->device = $device;
+					}
+				}
+				
+				if (preg_match('/NOKIALumia([0-9]+)/', $ua, $match)) {
+					$this->device->manufacturer = 'Nokia';
+					$this->device->model = $match[1];
+	
+					$device = DeviceModels::identify('wp', $this->device->model);
+					if ($device->identified) {
+						$this->device = $device;
+						$this->os->name = 'Windows Phone';
+					}
+				}
+			}
+			
+			
+			/****************************************************
+			 *		MicroB
+			 */
+		
+			if (preg_match('/Maemo[ |_]Browser/', $ua)) {
+				$this->browser->name = 'MicroB';
+
+				if (preg_match('/Maemo[ |_]Browser[ |_]([0-9.]*)/', $ua, $match)) {
+					$this->browser->version = new Version(array('value' => $match[1], 'details' => 3));
+				}
+			}
+			
+
+			/****************************************************
+			 *		NetFront
+			 */
+		
+			if (preg_match('/Net[fF]ront/', $ua)) {
+				$this->browser->name = 'NetFront';
+				$this->device->type = TYPE_MOBILE;
+
+				if (preg_match('/NetFront\/?([0-9.]*)/i', $ua, $match)) {
+					$this->browser->version = new Version(array('value' => $match[1]));
+				}
+
+				if (preg_match('/InettvBrowser/', $ua)) {
+					$this->device->type = TYPE_TELEVISION;
+				}
+			}
+			
+			/****************************************************
+			 *		Silk
+			 */
+		
+			if (preg_match('/Silk/', $ua)) {
+				if (preg_match('/Silk-Accelerated/', $ua)) {
+					$this->browser->name = 'Silk';
+
+					if (preg_match('/Silk\/([0-9.]*)/', $ua, $match)) {
+						$this->browser->version = new Version(array('value' => $match[1], 'details' => 2));
+					}
+	
+					if (preg_match('/; ([^;]*[^;\s])\s+Build/', $ua, $match)) {
+						$this->device = DeviceModels::identify('android', $match[1]);
+					}		
+
+					if (!$this->device->identified) {
+						$this->device->manufacturer = 'Amazon';
+						$this->device->model = 'Kindle Fire';
+						$this->device->type = TYPE_TABLET;
+						$this->device->identified = true;
+					}
+					
+					if ($this->os->name != 'Android') {
+						$this->os->name = 'Android';
+						$this->os->version = null;
+					}
+				}
+			}
+
+			/****************************************************
+			 *		Dolfin
+			 */
+		
+			if (preg_match('/Dolfin/', $ua) || preg_match('/Jasmine/', $ua)) {
+				$this->browser->name = 'Dolfin';
+
+				if (preg_match('/Dolfin\/([0-9.]*)/', $ua, $match)) {
+					$this->browser->version = new Version(array('value' => $match[1]));
+				}
+
+				if (preg_match('/Browser\/Dolfin([0-9.]*)/', $ua, $match)) {
+					$this->browser->version = new Version(array('value' => $match[1]));
+				}
+
+				if (preg_match('/Jasmine\/([0-9.]*)/', $ua, $match)) {
+					$this->browser->version = new Version(array('value' => $match[1]));
+				}
+			}
+
+			/****************************************************
+			 *		Iris
+			 */
+		
+			if (preg_match('/Iris/', $ua)) {
+				$this->browser->name = 'Iris';
+
+				$this->device->type = TYPE_MOBILE;
+				$this->device->manufacturer = null;
+				$this->device->model = null;
+
+				$this->os->name = 'Windows Mobile';
+				$this->os->version = null;
+
+				if (preg_match('/Iris\/([0-9.]*)/', $ua, $match)) {
+					$this->browser->version = new Version(array('value' => $match[1]));
+				}
+				
+				if (preg_match('/ WM([0-9]) /', $ua, $match)) {
+					$this->os->version = new Version(array('value' => $match[1] . '.0'));
+				} else {
+					$this->browser->mode = 'desktop';
+				}
+			}
+
+			/****************************************************
+			 *		Boxee
+			 */
+		
+			if (preg_match('/Boxee/', $ua)) {
+				$this->browser->name = 'Boxee';
+				$this->device->type = TYPE_TELEVISION;
+
+				if (preg_match('/Boxee\/([0-9.]*)/', $ua, $match)) {
+					$this->browser->version = new Version(array('value' => $match[1]));
+				}
+			}
+
+			/****************************************************
+			 *		LG Browser
+			 */
+
+			if (preg_match('/LG Browser\/([0-9.]*)/', $ua, $match)) {
+				$this->browser->name = 'LG Browser';
+				$this->browser->version = new Version(array('value' => $match[1], 'details' => 2));
+				$this->device->type = TYPE_TELEVISION;
+			}
+			
+			/****************************************************
+			 *		Espial
+			 */
+		
+			if (preg_match('/Espial/', $ua)) {
+				$this->browser->name = 'Espial';
+				
+				$this->os->name = '';
+				$this->os->version = null;
+
+				if ($this->device->type != TYPE_TELEVISION) {
+					$this->device->type = TYPE_TELEVISION;
+					$this->device->manufacturer = null;
+					$this->device->model = null;
+				}
+				
+				if (preg_match('/Espial\/([0-9.]*)/', $ua, $match)) {
+					$this->browser->version = new Version(array('value' => $match[1]));
+				}
+				
+				if (preg_match('/;L7200/', $ua)) {
+					$this->device->manufacturer = 'Toshiba';
+					$this->device->model = 'L7200 Smart TV';
+					$this->device->identified = true;
+				}
+			}
+
+			/****************************************************
+			 *		ANT Galio
+			 */
+
+			if (preg_match('/ANTGalio\/([0-9.]*)/', $ua, $match)) {
+				$this->browser->name = 'ANT Galio';
+				$this->browser->version = new Version(array('value' => $match[1], 'details' => 3));
+				$this->device->type = TYPE_TELEVISION;
+			}
+			
+			/****************************************************
+			 *		NetFront NX
+			 */
+
+			if (preg_match('/NX\/([0-9.]*)/', $ua, $match)) {
+				$this->browser->name = 'NetFront NX';
+				$this->browser->version = new Version(array('value' => $match[1], 'details' => 2));
+
+				if (preg_match('/DTV/i', $ua)) {
+					$this->device->type = TYPE_TELEVISION;
+				} else if (preg_match('/mobile/i', $ua)) {
+					$this->device->type = TYPE_MOBILE;
+				} else {
+					$this->device->type = TYPE_DESKTOP;
+				}
+				
+				$this->os->name = '';
+				$this->os->version = null;
+			}
+			
+			/****************************************************
+			 *		Obigo
+			 */
+		
+			if (preg_match('/Obigo/i', $ua)) {
+				$this->browser->name = 'Obigo';
+
+				if (preg_match('/Obigo\/([0-9.]*)/i', $ua, $match)) {
+					$this->browser->version = new Version(array('value' => $match[1]));
+				}
+
+				if (preg_match('/Obigo\/([A-Z])([0-9.]*)/i', $ua, $match)) {
+					$this->browser->name = 'Obigo ' . $match[1];
+					$this->browser->version = new Version(array('value' => $match[2]));
+				}
+
+				if (preg_match('/Obigo-([A-Z])([0-9.]*)\//i', $ua, $match)) {
+					$this->browser->name = 'Obigo ' . $match[1];
+					$this->browser->version = new Version(array('value' => $match[2]));
+				}
+
+				if (preg_match('/Browser\/Obigo-([A-Z])([0-9.]*)/i', $ua, $match)) {
+					$this->browser->name = 'Obigo ' . $match[1];
+					$this->browser->version = new Version(array('value' => $match[2]));
+				}
+			}
+
+			/****************************************************
+			 *		UC Web
+			 */
+		
+			if (preg_match('/UCWEB/', $ua)) {
+				$this->browser->stock = false;
+				$this->browser->name = 'UC Browser';
+				
+				if (preg_match('/UCWEB\/?([0-9]*[.][0-9]*)/', $ua, $match)) {
+					$this->browser->version = new Version(array('value' => $match[1], 'details' => 3));
+				}
+
+				if (!$this->device->type) {
+					$this->device->type = TYPE_MOBILE;
+				}
+
+				if (isset($this->os->name) && $this->os->name == 'Linux') {
+					$this->os->name = '';
+				}
+				
+				if (preg_match('/^IUC \(U;\s?iOS ([0-9\.]+);/', $ua, $match)) {
+					$this->os->name = 'iOS';
+					$this->os->version = new Version(array('value' => $match[1]));
+				}
+				
+				if (preg_match('/^JUC \(Linux; U; ([0-9\.]+)[^;]*; [^;]+; ([^;]*[^\s])\s*; [0-9]+\*[0-9]+\)/', $ua, $match)) {
+					$this->os->name = 'Android';
+					$this->os->version = new Version(array('value' => $match[1]));
+					
+					$this->device = DeviceModels::identify('android', $match[2]);
+				}
+			}
+
+			if (preg_match('/ucweb-squid/', $ua)) {
+				$this->browser->stock = false;
+				$this->browser->name = 'UC Browser';
+			}
+
+			if (preg_match('/\) UC /', $ua)) {
+				$this->browser->stock = false;
+				$this->browser->name = 'UC Browser';
+				
+				unset($this->browser->version);
+				unset($this->browser->channel);
+				unset($this->browser->mode);
+
+				if (!$this->device->type) {
+					$this->device->type = TYPE_MOBILE;
+				}
+				
+				if ($this->device->type == TYPE_DESKTOP) {
+					$this->device->type = TYPE_MOBILE;
+					$this->browser->mode = 'desktop';
+				}
+			}
+
+			if (preg_match('/UC ?Browser\/?([0-9.]*)/', $ua, $match)) {
+				$this->browser->stock = false;
+				$this->browser->name = 'UC Browser';
+				$this->browser->version = new Version(array('value' => $match[1], 'details' => 2));
+
+				if (!$this->device->type) {
+					$this->device->type = TYPE_MOBILE;
+				}
+			}
+						
+			/****************************************************
+			 *		NineSky
+			 */
+		
+			if (preg_match('/Ninesky(?:-android-mobile(?:-cn)?)?\/([0-9.]*)/', $ua, $match)) {
+				$this->browser->name = 'NineSky';
+				$this->browser->version = new Version(array('value' => $match[1]));
+
+				if ($this->os->name != 'Android') {
+					$this->os->name = 'Android';
+					$this->os->version = null;
+					
+					$this->device->manufacturer = null;
+					$this->device->model = null;
+				}
+			}
+
+			/****************************************************
+			 *		Skyfire
+			 */
+		
+			if (preg_match('/Skyfire\/([0-9.]*)/', $ua, $match)) {
+				$this->browser->name = 'Skyfire';
+				$this->browser->version = new Version(array('value' => $match[1]));
+
+				$this->device->type = TYPE_MOBILE;
+
+				$this->os->name = 'Android';
+				$this->os->version = null;
+			}
+			
+			/****************************************************
+			 *		Dolphin HD
+			 */
+		
+			if (preg_match('/DolphinHDCN\/([0-9.]*)/', $ua, $match)) {
+				$this->browser->name = 'Dolphin';
+				$this->browser->version = new Version(array('value' => $match[1]));
+
+				$this->device->type = TYPE_MOBILE;
+
+				if ($this->os->name != 'Android') {
+					$this->os->name = 'Android';
+					$this->os->version = null;
+				}
+			}
+
+			if (preg_match('/Dolphin\/(?:INT|CN)/', $ua, $match)) {
+				$this->browser->name = 'Dolphin';
+				$this->device->type = TYPE_MOBILE;
+			}
+			
+			/****************************************************
+			 *		QQ Browser
+			 */
+		
+			if (preg_match('/(M?QQBrowser)\/([0-9.]*)/', $ua, $match)) {
+				$this->browser->name = 'QQ Browser';
+
+				$version = $match[2];
+				if (preg_match('/^[0-9][0-9]$/', $version)) $version = $version[0] . '.' . $version[1];
+				
+				$this->browser->version = new Version(array('value' => $version, 'details' => 2));
+				$this->browser->channel = '';
+				
+				if (!$this->os->name && $match[1] == 'QQBrowser') {
+					$this->os->name = 'Windows';
+				}
+			}	
+
+			/****************************************************
+			 *		iBrowser
+			 */
+		
+			if (preg_match('/(iBrowser)\/([0-9.]*)/', $ua, $match) && !preg_match('/OviBrowser/', $ua)) {
+				$this->browser->name = 'iBrowser';
+				
+				$version = $match[2];
+				if (preg_match('/^[0-9][0-9]$/', $version)) $version = $version[0] . '.' . $version[1];
+				
+				$this->browser->version = new Version(array('value' => $version, 'details' => 2));
+				$this->browser->channel = '';
+			}	
+
+			/****************************************************
+			 *		Puffin
+			 */
+		
+			if (preg_match('/Puffin\/([0-9.]*)/', $ua, $match)) {
+				$this->browser->name = 'Puffin';
+				$this->browser->version = new Version(array('value' => $match[1], 'details' => 2));
+				$this->browser->channel = '';
+				
+				$this->device->type = TYPE_MOBILE;
+
+				if ($this->os->name == 'Linux') {
+					$this->os->name = null;
+					$this->os->version = null;
+				}
+			}	
+
+			/****************************************************
+			 *		Midori
+			 */
+		
+			if (preg_match('/Midori\/([0-9.]*)/', $ua, $match)) {
+				$this->browser->name = 'Midori';
+				$this->browser->version = new Version(array('value' => $match[1]));
+
+				if ($this->os->name != 'Linux') {
+					$this->os->name = 'Linux';
+					$this->os->version = null;
+				}
+
+				$this->device->manufacturer = null;
+				$this->device->model = null;
+				$this->device->type = TYPE_DESKTOP;
+			}	
+
+			if (preg_match('/midori$/', $ua)) {
+				$this->browser->name = 'Midori';
+			}
+
+
+			/****************************************************
+			 *		MiniBrowser Mobile
+			 */
+		
+			if (preg_match('/MiniBr?owserM(?:obile)?\/([0-9.]*)/', $ua, $match)) {
+				$this->browser->name = 'MiniBrowser';
+				$this->browser->version = new Version(array('value' => $match[1]));
+
+				$this->os->name = 'Series60';
+				$this->os->version = null;
+			}
+						
+			/****************************************************
+			 *		Maxthon
+			 */
+		
+			if (preg_match('/Maxthon[\/\' ]([0-9.]*)/', $ua, $match)) {
+				$this->browser->name = 'Maxthon';
+				$this->browser->version = new Version(array('value' => $match[1], 'details' => 2));
+				
+				if ($this->os->name == 'Windows' && $this->browser->version->toFloat() < 4) {
+					$this->browser->version->details = 1;
+				}
+			}	
+
+			/****************************************************
+			 *		Others
+			 */
+
+			$browsers = array(
+				array('name' => 'AdobeAIR',				'regexp' => '/AdobeAIR\/([0-9.]*)/'),
+				array('name' => 'Awesomium',			'regexp' => '/Awesomium\/([0-9.]*)/'),
+				array('name' => 'Bsalsa Embedded',		'regexp' => '/EmbeddedWB ([0-9.]*)/'),
+				array('name' => 'Canvace',				'regexp' => '/Canvace Standalone\/([0-9.]*)/'),
+				array('name' => 'Ekioh',				'regexp' => '/Ekioh\/([0-9.]*)/'),
+				array('name' => 'JavaFX',				'regexp' => '/JavaFX\/([0-9.]*)/'),
+				array('name' => 'GFXe',					'regexp' => '/GFXe\/([0-9.]*)/'),
+				array('name' => 'LuaKit',				'regexp' => '/luakit/'),
+				array('name' => 'Titanium',				'regexp' => '/Titanium\/([0-9.]*)/'),
+				array('name' => 'OpenWebKitSharp',		'regexp' => '/OpenWebKitSharp/'),
+				array('name' => 'Prism',				'regexp' => '/Prism\/([0-9.]*)/'),
+				array('name' => 'Qt',					'regexp' => '/Qt\/([0-9.]*)/'),
+				array('name' => 'QtEmbedded',			'regexp' => '/QtEmbedded/'),
+				array('name' => 'QtEmbedded',			'regexp' => '/QtEmbedded.*Qt\/([0-9.]*)/'),
+				array('name' => 'RhoSimulator',			'regexp' => '/RhoSimulator/'),
+				array('name' => 'UWebKit',				'regexp' => '/UWebKit\/([0-9.]*)/'),
+				
+				array('name' => 'PhantomJS',			'regexp' => '/PhantomJS\/([0-9.]*)/'),
+				array('name' => 'Google Web Preview',	'regexp' => '/Google Web Preview/'),
+				
+				array('name' => 'Google Earth',			'regexp' => '/Google Earth\/([0-9.]*)/'),
+				array('name' => 'EA Origin',			'regexp' => '/Origin\/([0-9.]*)/'),
+				array('name' => 'SecondLife',			'regexp' => '/SecondLife\/([0-9.]*)/'),
+				array('name' => 'Valve Steam',			'regexp' => '/Valve Steam/'),
+				
+				array('name' => 'Songbird',				'regexp' => '/Songbird\/([0-9.]*)/'),
+				array('name' => 'Thunderbird',			'regexp' => '/Thunderbird\/([0-9.]*)/', 'type' => TYPE_DESKTOP),
+				
+				array('name' => '360 Extreme Explorer',	'regexp' => '/QIHU 360EE/', 'type' => TYPE_DESKTOP),
+				array('name' => '360 Safe Explorer',	'regexp' => '/QIHU 360SE/', 'type' => TYPE_DESKTOP),
+				array('name' => '360 Phone Browser',	'regexp' => '/360 Android Phone Browser \(V([0-9.]*)\)/'),
+				array('name' => '360 Phone Browser',	'regexp' => '/360 Aphone Browser \(Version ([0-9.]*)\)/'),
+				array('name' => 'ABrowse',				'regexp' => '/A[Bb]rowse ([0-9.]*)/'),
+				array('name' => 'Abrowser',				'regexp' => '/Abrowser\/([0-9.]*)/'),
+				array('name' => 'arora',				'regexp' => '/[Aa]rora\/([0-9.]*)/'),
+				array('name' => 'Avant Browser',		'regexp' => '/Avant TriCore/'),
+				array('name' => 'Baidu Browser',		'regexp' => '/M?BaiduBrowser\/([0-9.]*)/i'),
+				array('name' => 'Baidu Browser',		'regexp' => '/BdMobile\/([0-9.]*)/i'),
+				array('name' => 'Baidu Browser',		'regexp' => '/FlyFlow\/([0-9.]*)/', 'details' => 2),
+				array('name' => 'Baidu Browser',		'regexp' => '/BIDUBrowser[ \/]([0-9.]*)/'),
+				array('name' => 'Camino', 				'regexp' => '/Camino\/([0-9.]*)/', 'type' => TYPE_DESKTOP),
+				array('name' => 'Canure', 				'regexp' => '/Canure\/([0-9.]*)/', 'details' => 3),
+				array('name' => 'CometBird', 			'regexp' => '/CometBird\/([0-9.]*)/'),
+				array('name' => 'Comodo Dragon', 		'regexp' => '/Comodo_Dragon\/([0-9.]*)/', 'details' => 2),
+				array('name' => 'Conkeror', 			'regexp' => '/[Cc]onkeror\/([0-9.]*)/'),
+				array('name' => 'CoolNovo', 			'regexp' => '/(?:CoolNovo|CoolNovoChromePlus)\/([0-9.]*)/', 'details' => 3, 'type' => TYPE_DESKTOP),
+				array('name' => 'ChromePlus', 			'regexp' => '/ChromePlus(?:\/([0-9.]*))?$/', 'details' => 3, 'type' => TYPE_DESKTOP),
+				array('name' => 'Daedalus', 			'regexp' => '/Daedalus ([0-9.]*)/', 'details' => 2),
+				array('name' => 'Demobrowser', 			'regexp' => '/demobrowser\/([0-9.]*)/'),
+				array('name' => 'Doga Rhodonit', 		'regexp' => '/DogaRhodonit/'),
+				array('name' => 'Dooble', 				'regexp' => '/Dooble(?:\/([0-9.]*))?/'),
+				array('name' => 'Dorothy', 				'regexp' => '/Dorothy$/'),
+				array('name' => 'DWB', 					'regexp' => '/dwb(?:-hg)?(?:\/([0-9.]*))?/'),
+				array('name' => 'GNOME Web', 			'regexp' => '/Epiphany\/([0-9.]*)/', 'type' => TYPE_DESKTOP),
+				array('name' => 'EVM Browser', 			'regexp' => '/EVMBrowser\/([0-9.]*)/'),
+				array('name' => 'FireWeb', 				'regexp' => '/FireWeb\/([0-9.]*)/'),
+				array('name' => 'Flock', 				'regexp' => '/Flock\/([0-9.]*)/', 'details' => 3, 'type' => TYPE_DESKTOP),
+				array('name' => 'Galeon', 				'regexp' => '/Galeon\/([0-9.]*)/', 'details' => 3),
+				array('name' => 'Helium', 				'regexp' => '/HeliumMobileBrowser\/([0-9.]*)/'),
+				array('name' => 'Hive Explorer', 		'regexp' => '/HiveE/'),
+				array('name' => 'iCab', 				'regexp' => '/iCab\/([0-9.]*)/'),
+				array('name' => 'Iceape', 				'regexp' => '/Iceape\/([0-9.]*)/'),
+				array('name' => 'IceCat', 				'regexp' => '/IceCat[ \/]([0-9.]*)/', 'type' => TYPE_DESKTOP),
+				array('name' => 'Iceweasel', 			'regexp' => '/Iceweasel\/([0-9.]*)/', 'type' => TYPE_DESKTOP),
+				array('name' => 'InternetSurfboard', 	'regexp' => '/InternetSurfboard\/([0-9.]*)/'),
+				array('name' => 'Iron', 				'regexp' => '/Iron\/([0-9.]*)/', 'details' => 2),
+				array('name' => 'Isis', 				'regexp' => '/BrowserServer/'),
+				array('name' => 'Jumanji', 				'regexp' => '/jumanji/'),
+				array('name' => 'Kazehakase', 			'regexp' => '/Kazehakase\/([0-9.]*)/'),
+				array('name' => 'KChrome', 				'regexp' => '/KChrome\/([0-9.]*)/', 'details' => 3),
+				array('name' => 'K-Meleon', 			'regexp' => '/K-Meleon\/([0-9.]*)/', 'type' => TYPE_DESKTOP),
+				array('name' => 'Leechcraft', 			'regexp' => '/Leechcraft(?:\/([0-9.]*))?/', 'details' => 2),
+				array('name' => 'Lightning', 			'regexp' => '/Lightning\/([0-9.]*)/'),
+				array('name' => 'Lunascape', 			'regexp' => '/Lunascape[\/| ]([0-9.]*)/', 'details' => 3),
+				array('name' => 'iLunascape', 			'regexp' => '/iLunascape\/([0-9.]*)/', 'details' => 3),
+				array('name' => 'Intermec Browser', 	'regexp' => '/Intermec\/([0-9.]*)/', 'details' => 2),
+				array('name' => 'MaCross Mobile', 		'regexp' => '/MaCross\/([0-9.]*)/'),
+				array('name' => 'Mercury Browser', 		'regexp' => '/Mercury\/([0-9.]*)/'),
+				array('name' => 'MixShark', 			'regexp' => '/MixShark\/([0-9.]*)/'),
+				array('name' => 'Motorola WebKit', 		'regexp' => '/MotorolaWebKit(?:\/([0-9.]*))?/', 'details' => 3),
+				array('name' => 'NetFront LifeBrowser', 'regexp' => '/NetFrontLifeBrowser\/([0-9.]*)/'),
+				array('name' => 'Netscape Navigator', 	'regexp' => '/Navigator\/([0-9.]*)/', 'details' => 3),
+				array('name' => 'Odyssey', 				'regexp' => '/OWB\/([0-9.]*)/'),
+				array('name' => 'OmniWeb', 				'regexp' => '/OmniWeb/', 'type' => TYPE_DESKTOP),
+				array('name' => 'OneBrowser', 			'regexp' => '/OneBrowser\/([0-9.]*)/'),
+				array('name' => 'Orca', 				'regexp' => '/Orca\/([0-9.]*)/'),
+				array('name' => 'Open Sankoré', 		'regexp' => '/Open-Sankore\/([0-9.]*)/'),
+				array('name' => 'Origyn', 				'regexp' => '/Origyn Web Browser/'),
+				array('name' => 'Palemoon', 			'regexp' => '/Pale[mM]oon\/([0-9.]*)/'),
+				array('name' => 'Phantom', 				'regexp' => '/Phantom\/V([0-9.]*)/'),
+				array('name' => 'Polaris', 				'regexp' => '/Polaris\/v?([0-9.]*)/i', 'details' => 2),
+				array('name' => 'Qihoo 360', 			'regexp' => '/QIHU THEWORLD/'),
+				array('name' => 'QtCreator', 			'regexp' => '/QtCreator\/([0-9.]*)/'),
+				array('name' => 'QtQmlViewer', 			'regexp' => '/QtQmlViewer/'),
+				array('name' => 'QtTestBrowser', 		'regexp' => '/QtTestBrowser\/([0-9.]*)/'),
+				array('name' => 'QtWeb', 				'regexp' => '/QtWeb Internet Browser\/([0-9.]*)/'),
+				array('name' => 'QupZilla', 			'regexp' => '/QupZilla\/([0-9.]*)/', 'type' => TYPE_DESKTOP),
+				array('name' => 'Roccat', 				'regexp' => '/Roccat\/([0-9]\.[0-9.]*)/'),
+				array('name' => 'Raven for Mac', 		'regexp' => '/Raven for Mac\/([0-9.]*)/'),
+				array('name' => 'rekonq', 				'regexp' => '/rekonq/', 'type' => TYPE_DESKTOP),
+				array('name' => 'RockMelt', 			'regexp' => '/RockMelt\/([0-9.]*)/', 'details' => 2),
+				array('name' => 'Sleipnir', 			'regexp' => '/Sleipnir\/([0-9.]*)/', 'details' => 3),
+				array('name' => 'SMBrowser', 			'regexp' => '/SMBrowser/'),
+				array('name' => 'Sogou Explorer', 		'regexp' => '/SE 2.X MetaSr/', 'type' => TYPE_DESKTOP),
+				array('name' => 'Sogou Mobile',			'regexp' => '/SogouMobileBrowser\/([0-9.]*)/', 'details' => 2),
+				array('name' => 'Snowshoe', 			'regexp' => '/Snowshoe\/([0-9.]*)/', 'details' => 2),
+				array('name' => 'Sputnik', 				'regexp' => '/Sputnik\/([0-9.]*)/i', 'details' => 3),
+				array('name' => 'Stainless', 			'regexp' => '/Stainless\/([0-9.]*)/'),
+				array('name' => 'SunChrome', 			'regexp' => '/SunChrome\/([0-9.]*)/'),
+				array('name' => 'Surf', 				'regexp' => '/Surf\/([0-9.]*)/'),
+				array('name' => 'TaoBrowser', 			'regexp' => '/TaoBrowser\/([0-9.]*)/', 'details' => 2),
+				array('name' => 'TaomeeBrowser', 		'regexp' => '/TaomeeBrowser\/([0-9.]*)/', 'details' => 2),
+				array('name' => 'TazWeb', 				'regexp' => '/TazWeb/'),
+				array('name' => 'Uzbl', 				'regexp' => '/^Uzbl/'),
+				array('name' => 'Viera', 				'regexp' => '/Viera\/([0-9.]*)/'),
+				array('name' => 'Villanova', 			'regexp' => '/Villanova\/([0-9.]*)/', 'details' => 3),
+				array('name' => 'Wavelink Velocity',	'regexp' => '/Wavelink Velocity Browser\/([0-9.]*)/', 'details' => 2),
+				array('name' => 'WebPositive', 			'regexp' => '/WebPositive/'),
+				array('name' => 'WebRender', 			'regexp' => '/WebRender/'),
+				array('name' => 'Wyzo', 				'regexp' => '/Wyzo\/([0-9.]*)/', 'details' => 3),
+				array('name' => 'Yandex Browser', 		'regexp' => '/YaBrowser\/([0-9.]*)/', 'details' => 2),
+				array('name' => 'Zetakey', 				'regexp' => '/Zetakey Webkit\/([0-9.]*)/'),
+				array('name' => 'Zetakey', 				'regexp' => '/Zetakey\/([0-9.]*)/')
+			);
+
+			for ($b = 0; $b < count($browsers); $b++) {
+				if (preg_match($browsers[$b]['regexp'], $ua, $match)) {
+					$this->browser->name = $browsers[$b]['name'];
+					$this->browser->channel = '';
+					$this->browser->stock = false;
+
+					if ($match[1]) {
+						$this->browser->version = new Version(array('value' => $match[1], 'details' => isset($browsers[$b]['details']) ? $browsers[$b]['details'] : null));
+					} else {
+						$this->browser->version = null;
+					}
+					
+					if (isset($browsers[$b]['type']) && $this->device->type == '') {
+						$this->device->type = $browsers[$b]['type'];
+					}
+				}
+			}
+
+
+			/****************************************************
+			 *		WebKit
+			 */
+	
+			if (preg_match('/WebKit\/([0-9.]*)/i', $ua, $match)) {
+				$this->engine->name = 'Webkit';
+				$this->engine->version = new Version(array('value' => $match[1]));
+			}
+
+			if (preg_match('/Browser\/AppleWebKit([0-9.]*)/i', $ua, $match)) {
+				$this->engine->name = 'Webkit';
+				$this->engine->version = new Version(array('value' => $match[1]));
+			}
+
+			/****************************************************
+			 *		KHTML
+			 */
+		
+			if (preg_match('/KHTML\/([0-9.]*)/', $ua, $match)) {
+				$this->engine->name = 'KHTML';
+				$this->engine->version = new Version(array('value' => $match[1]));
+			}
+
+			/****************************************************
+			 *		Gecko
+			 */
+		
+			if (preg_match('/Gecko/', $ua) && !preg_match('/like Gecko/', $ua)) {
+				$this->engine->name = 'Gecko';
+
+				if (preg_match('/; rv:([^\)]+)\)/', $ua, $match)) {
+					$this->engine->version = new Version(array('value' => $match[1]));
+				}
+			}
+
+			/****************************************************
+			 *		Presto
+			 */
+		
+			if (preg_match('/Presto\/([0-9.]*)/', $ua, $match)) {
+				$this->engine->name = 'Presto';
+				$this->engine->version = new Version(array('value' => $match[1]));
+			}
+
+			/****************************************************
+			 *		Trident
+			 */
+		
+			if (preg_match('/Trident\/([0-9.]*)/', $ua, $match)) {
+				$this->engine->name = 'Trident';
+				$this->engine->version = new Version(array('value' => $match[1]));
+
+				
+				if ($this->browser->name == 'Internet Explorer') {
+					if ($this->engine->version->toNumber() == 6 && $this->browser->version->toFloat() < 10) {
+						$this->browser->version = new Version(array('value' => '10.0'));
+						$this->browser->mode = 'compat';
+					}
+
+					if ($this->engine->version->toNumber() == 5 && $this->browser->version->toFloat() < 9) {
+						$this->browser->version = new Version(array('value' => '9.0'));
+						$this->browser->mode = 'compat';
+					}
+
+					if ($this->engine->version->toNumber() == 4 && $this->browser->version->toFloat() < 8) {
+						$this->browser->version = new Version(array('value' => '8.0'));
+						$this->browser->mode = 'compat';
+					}
+				}
+
+				if ($this->os->name == 'Windows Phone') {
+					if ($this->engine->version->toNumber() == 6 && $this->browser->version->toFloat() < 8) {
+						$this->os->version = new Version(array('value' => '8.0'));
+					}
+
+					if ($this->engine->version->toNumber() == 5 && $this->browser->version->toFloat() < 7.5) {
+						$this->os->version = new Version(array('value' => '7.5'));
+					}
+				}
+			}
+			
+
+			/****************************************************
+			 *		Corrections
+			 */
+		
+			if (isset($this->os->name)) {
+				if ($this->os->name == 'Android' && $this->browser->stock) {
+					$this->browser->hidden = true;
+				}
+	
+				if ($this->os->name == 'Aliyun OS' && $this->browser->stock) {
+					$this->browser->hidden = true;
+				}
+			}
+
+			if (isset($this->os->name) && isset($this->browser->name)) {
+				if ($this->os->name == 'iOS' && $this->browser->name == 'Opera Mini') {
+					$this->os->version = null;
+				}
+			}
+			
+			if (isset($this->browser->name) && isset($this->engine->name)) {
+				if ($this->browser->name == 'Midori' && $this->engine->name != 'Webkit') {
+					$this->engine->name = 'Webkit';
+					$this->engine->version = null;
+				}
+			}
+				
+				
+			if (isset($this->browser->name) && $this->browser->name == 'Firefox Mobile' && !isset($this->os->name)) {
+				$this->os->name = 'Firefox OS';
+			}
+				
+			
+			if ($this->device->type == TYPE_TELEVISION && $this->browser->name == 'Opera') {
+				$this->browser->name = 'Opera Devices';
+				
+				if (preg_match('/Presto\/([0-9]+\.[0-9]+)/', $ua, $match)) {
+					switch($match[1]) {
+						case '2.12':		$this->browser->version = new Version(array('value' => '3.4')); break;
+						case '2.11':		$this->browser->version = new Version(array('value' => '3.3')); break;
+						case '2.10':		$this->browser->version = new Version(array('value' => '3.2')); break;
+						case '2.9':			$this->browser->version = new Version(array('value' => '3.1')); break;
+						case '2.8':			$this->browser->version = new Version(array('value' => '3.0')); break;
+						case '2.7':			$this->browser->version = new Version(array('value' => '2.9')); break;
+						case '2.6':			$this->browser->version = new Version(array('value' => '2.8')); break;
+						case '2.4':			$this->browser->version = new Version(array('value' => '10.3')); break;
+						case '2.3':			$this->browser->version = new Version(array('value' => '10')); break;
+						case '2.2':			$this->browser->version = new Version(array('value' => '9.7')); break;
+						case '2.1':			$this->browser->version = new Version(array('value' => '9.6')); break;
+						default:			unset($this->browser->version);
+					}
+				}
+				
+				unset($this->os->name);
+				unset($this->os->version);
+			}
+			
+			if (isset($this->browser->name)) {
+				if ($this->browser->name == 'UC Browser') {
+					if ($this->device->type == 'desktop' || (isset($this->os->name) && ($this->os->name == 'Windows' || $this->os->name == 'Mac OS X'))) {
+						$this->device->type = TYPE_MOBILE;
+						
+						$this->browser->mode = 'desktop';
+						
+						unset($this->engine->name);
+						unset($this->engine->version);
+						unset($this->os->name);
+						unset($this->os->version);
+					}
+				
+					else if (!isset($this->os->name) || ($this->os->name != 'iOS' && $this->os->name != 'Android' && $this->os->name != 'Aliyun OS')) {
+						$this->engine->name = 'Gecko';
+						unset($this->engine->version);
+						$this->browser->mode = 'proxy';
+					}
+					
+					if (isset($this->engine->name) && $this->engine->name == 'Presto') {
+						$this->engine->name = 'Webkit';
+						unset($this->engine->version);
+					}
+				}
+			}
+			
+			if (isset($this->device->flag) && $this->device->flag == FLAG_GOOGLETV) {
+				$this->os->name = 'Google TV';
+
+				unset($this->os->version);	
+				unset($this->device->flag);			
+			}
+
+			if (!$this->device->identified && isset($this->device->model)) {
+				if (preg_match('/^[a-z][a-z]-[a-z][a-z]$/', $this->device->model)) {
+					$this->device->model = null;
+				}
+			}
+			
+		}
+		
+		function toJavaScript() {
+			if (isset($this->browser)) {
+				echo "\t\t\tthis.browser = { ";
+				echo $this->toJavaScriptObject($this->browser);
+				echo " };\n";
+			}
+			
+			if (isset($this->engine)) {
+				echo "\t\t\tthis.engine = { ";
+				echo $this->toJavaScriptObject($this->engine);
+				echo " };\n";
+			}
+			
+			if (isset($this->os)) {
+				echo "\t\t\tthis.os = { ";
+				echo $this->toJavaScriptObject($this->os);
+				echo " };\n";
+			}
+			
+			if (isset($this->device)) {
+				echo "\t\t\tthis.device = { ";
+				echo $this->toJavaScriptObject($this->device);
+				echo " };\n";
+			}	
+		}
+		
+		function toJavaScriptObject($object) {
+			$lines = array();
+
+			foreach ((array)$object as $key => $value) {
+				if (!is_null($value)) {
+					$line = $key . ": ";
+					
+					if ($key == 'version') {
+						$line .= 'new Version({ ' . $this->toJavaScriptObject($value) . ' })';
+					} else {
+						switch(gettype($value)) {
+							case 'boolean':		$line .= $value ? 'true' : 'false'; break;
+							case 'string':		$line .= '"' . addslashes($value) . '"'; break;
+							case 'integer':		$line .= $value; break;
+						}
+					}
+					
+					$lines[] = $line;
+				}
+			}
+			
+			return implode($lines, ", ");
+		}
+	}
+	

From d4220bcad9db10b5e042a54215b89fb2cd28e0d3 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 10:49:09 +0200
Subject: [PATCH 103/174] Retrieve data from new table structure

---
 backend/browser.php | 121 +++++++++++++++++++++++++++-----------------
 backend/feature.php |  37 +++++++-------
 backend/index.php   | 102 +++++++++++++++++++++++++++++--------
 backend/results.php |  27 +++++-----
 4 files changed, 191 insertions(+), 96 deletions(-)

diff --git a/backend/browser.php b/backend/browser.php
index d1e7b31c..4228f77a 100644
--- a/backend/browser.php
+++ b/backend/browser.php
@@ -15,18 +15,20 @@
 			SELECT 
 				b.unique AS id, b.nickname, b.details, '" . $type . "' AS type
 			FROM 
-				browsers AS b, 
-				scores AS s 
+				browsers AS b
+				LEFT JOIN scores AS s ON (b.unique = s.id)
+				LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
 			WHERE 
-				b.unique = s.id AND
 				b.listed = 1 AND
 				FIND_IN_SET('" . $type . "',b.type) AND
 				s.version = '" . $version . "' AND
-				s.points != ''
+				f.points != ''
 			ORDER BY 
 				id, nickname
 		");
 		
+		echo mysql_error();
+		
 		while ($row = mysql_fetch_object($res)) {
 			$results[] = $row;
 		}
@@ -38,62 +40,87 @@
 		$show = explode('/', $_REQUEST['show']);
 	
 		if (isset($show[0])) {
-			$res = mysql_query("
-				SELECT 
-					b.unique AS id, b.nickname, s.score, s.bonus, s.points, s.results 
-				FROM 
-					browsers AS b, 
-					scores AS s 
-				WHERE 
-					b.unique = s.id AND 
-					b.listed = 1 AND
-					s.version = '" . $version . "' AND
-					b.unique ='" . mysql_real_escape_string($show[0]) . "'
-			");
+			if (preg_match("/^[0-9]+\_[a-f0-9]{4,4}$/", $show[0])) {
+				if ($row = getResultsForUniqueId($show[0])) {
+					$tpl->set('one', json_encode($row));
+				}
+			}
 			
-			if ($row = mysql_fetch_object($res)) {
-				$tpl->set('one', json_encode($row));
+			else {
+				if ($row = getResultsForBrowser($show[0], $version)) {
+					$tpl->set('one', json_encode($row));
+				}
 			}
 		}
 		
 		if (isset($show[1])) {
-			$res = mysql_query("
-				SELECT 
-					b.unique AS id, b.nickname, s.score, s.bonus, s.points, s.results 
-				FROM 
-					browsers AS b, 
-					scores AS s 
-				WHERE 
-					b.unique = s.id AND 
-					b.listed = 1 AND
-					s.version = '" . $version . "' AND
-					b.unique ='" . mysql_real_escape_string($show[1]) . "'
-			");
+			if (preg_match("/^[0-9]+\_[a-f0-9]{4,4}$/", $show[1])) {
+				if ($row = getResultsForUniqueId($show[1])) {
+					$tpl->set('two', json_encode($row));
+				}
+			}
 			
-			if ($row = mysql_fetch_object($res)) {
-				$tpl->set('two', json_encode($row));
+			else {
+				if ($row = getResultsForBrowser($show[1], $version)) {
+					$tpl->set('two', json_encode($row));
+				}
 			}
 		}
 			
 		if (isset($show[2])) {
-			$res = mysql_query("
-				SELECT 
-					b.unique AS id, b.nickname, s.score, s.bonus, s.points, s.results 
-				FROM 
-					browsers AS b, 
-					scores AS s 
-				WHERE 
-					b.unique = s.id AND 
-					b.listed = 1 AND
-					s.version = '" . $version . "' AND
-					b.unique ='" . mysql_real_escape_string($show[2]) . "'
-			");
+			if (preg_match("/^[0-9]+\_[a-f0-9]{4,4}$/", $show[2])) {
+				if ($row = getResultsForUniqueId($show[2])) {
+					$tpl->set('three', json_encode($row));
+				}
+			}
 			
-			if ($row = mysql_fetch_object($res)) {
-				$tpl->set('three', json_encode($row));
+			else {
+				if ($row = getResultsForBrowser($show[2], $version)) {
+					$tpl->set('three', json_encode($row));
+				}
 			}
 		}
 	}
 	
 	
-	echo $tpl->fetch();
\ No newline at end of file
+	echo $tpl->fetch();
+	
+		
+	function getResultsForBrowser($browser, $version) {
+		$res = mysql_query("
+			SELECT 
+				b.unique AS id, b.nickname, f.score, f.bonus, f.points, f.results 
+			FROM 
+				browsers AS b
+				LEFT JOIN scores AS s ON (b.unique = s.id)
+				LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
+			WHERE 
+				b.listed = 1 AND
+				s.version = '" . $version . "' AND
+				b.unique ='" . mysql_real_escape_string($browser) . "'
+		");
+		
+		if ($row = mysql_fetch_object($res)) {
+			return $row;
+		}		
+	}
+	
+
+
+	function getResultsForUniqueId($id) {
+		$res = mysql_query("
+			SELECT 
+				r.uniqueid AS id, 'Unique id' AS nickname, r.score, r.bonus, r.points, r.results, humanReadable, useragentHeader AS useragent, deviceWidth, deviceHeight 
+			FROM 
+				results AS r
+			WHERE 
+				r.uniqueid ='" . mysql_real_escape_string($id) . "'
+		");
+		
+		if ($row = mysql_fetch_object($res)) {
+			return $row;
+		}		
+	}
+	
+	
+	
\ No newline at end of file
diff --git a/backend/feature.php b/backend/feature.php
index 3e27617f..6de07917 100644
--- a/backend/feature.php
+++ b/backend/feature.php
@@ -15,18 +15,21 @@
 			SELECT 
 				b.unique AS id, CONCAT(b.unique,'-" . $type . "-',b.id) AS uid, b.nickname, b.details, '" . $type . "' AS type
 			FROM 
-				browsers AS b, 
-				scores AS s 
+				browsers AS b
+				LEFT JOIN scores AS s ON (b.unique = s.id)
+				LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
 			WHERE 
-				b.unique = s.id AND
 				b.listed = 1 AND
 				FIND_IN_SET('" . $type . "',b.type) AND
-				s.version = '" . $version . "' AND
-				s.points != ''
+				f.version = '" . $version . "' AND
+				f.points != ''
 			ORDER BY 
 				id, nickname
 		");
 		
+			echo mysql_error();
+			
+
 		while ($row = mysql_fetch_object($res)) {
 			$results[] = $row;
 		}
@@ -42,12 +45,12 @@
 			
 			$res = mysql_query("
 				SELECT 
-					IF(s.results LIKE '%" . mysql_real_escape_string($show[0]) . "=1%',1,0) AS supported, b.unique AS id, CONCAT(b.unique,'-',b.id) AS uid
+					IF(f.results LIKE '%" . mysql_real_escape_string($show[0]) . "=1%',1,0) AS supported, b.unique AS id, CONCAT(b.unique,'-',b.id) AS uid
 				FROM 
-					browsers AS b, 
-					scores AS s 
+					browsers AS b			
+					LEFT JOIN scores AS s ON (b.unique = s.id)
+					LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
 				WHERE 
-					b.unique = s.id AND 
 					b.listed = 1 AND
 					s.version = '" . $version . "'
 			");
@@ -67,12 +70,12 @@
 			
 			$res = mysql_query("
 				SELECT 
-					IF(s.results LIKE '%" . mysql_real_escape_string($show[1]) . "=1%',1,0) AS supported, b.unique AS id, CONCAT(b.unique,'-',b.id) AS uid 
+					IF(f.results LIKE '%" . mysql_real_escape_string($show[1]) . "=1%',1,0) AS supported, b.unique AS id, CONCAT(b.unique,'-',b.id) AS uid 
 				FROM 
-					browsers AS b, 
-					scores AS s 
+					browsers AS b 
+					LEFT JOIN scores AS s ON (b.unique = s.id)
+					LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
 				WHERE 
-					b.unique = s.id AND 
 					b.listed = 1 AND
 					s.version = '" . $version . "'
 			");
@@ -92,12 +95,12 @@
 			
 			$res = mysql_query("
 				SELECT 
-					IF(s.results LIKE '%" . mysql_real_escape_string($show[2]) . "=1%',1,0) AS supported, b.unique AS id, CONCAT(b.unique,'-',b.id) AS uid 
+					IF(f.results LIKE '%" . mysql_real_escape_string($show[2]) . "=1%',1,0) AS supported, b.unique AS id, CONCAT(b.unique,'-',b.id) AS uid 
 				FROM 
-					browsers AS b, 
-					scores AS s 
+					browsers AS b
+					LEFT JOIN scores AS s ON (b.unique = s.id)
+					LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
 				WHERE 
-					b.unique = s.id AND 
 					b.listed = 1 AND
 					s.version = '" . $version . "'
 			");
diff --git a/backend/index.php b/backend/index.php
index ec28ba7d..6e39ce71 100644
--- a/backend/index.php
+++ b/backend/index.php
@@ -23,12 +23,12 @@
 			
 			$res = mysql_query("
 				SELECT 
-					IF(s.results LIKE '%" . mysql_real_escape_string($_REQUEST['id']) . "=1%',1,0) AS supported, b.unique AS id, CONCAT(b.unique,'-',b.id) AS uid
+					IF(f.results LIKE '%" . mysql_real_escape_string($_REQUEST['id']) . "=1%',1,0) AS supported, b.unique AS id, CONCAT(b.unique,'-',b.id) AS uid
 				FROM 
-					browsers AS b, 
-					scores AS s 
+					browsers AS b
+					LEFT JOIN scores AS s ON (b.unique = s.id)
+					LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
 				WHERE 
-					b.unique = s.id AND 
 					b.listed = 1 AND
 					s.version = '" . $version . "'
 			");
@@ -48,7 +48,7 @@
 			if (substr($_REQUEST['id'], 0, 7) == 'custom:') {
 				$res = mysql_query("
 					SELECT 
-						'custom' AS id, 'Unique id'  AS nickname, score, bonus, points, results 
+						uniqueid AS id, 'Unique id'  AS nickname, score, bonus, points, results, humanReadable, useragentHeader AS useragent, deviceWidth, deviceHeight
 					FROM 
 						results 
 					WHERE 
@@ -57,12 +57,12 @@
 			} else {
 				$res = mysql_query("
 					SELECT 
-						b.unique AS id, b.nickname, s.score, s.bonus, s.points, s.results 
+						b.unique AS id, b.nickname, f.score, f.bonus, f.points, f.results 
 					FROM 
-						browsers AS b, 
-						scores AS s 
+						browsers AS b 
+						LEFT JOIN scores AS s ON (b.unique = s.id)
+						LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
 					WHERE 
-						b.unique = s.id AND 
 						b.listed = 1 AND
 						s.version = '" . $version . "' AND
 						b.unique ='" . mysql_real_escape_string($_REQUEST['id']) . "'
@@ -79,13 +79,26 @@
 			$payload = json_decode($_REQUEST['payload']);
 			$headers = apache_request_headers();
 						
-			$xWapProfile = isset($headers['x-wap-profile']) ? $headers['x-wap-profile'] : '';
-			$xDeviceStockUA = isset($headers['Device-Stock-UA']) ? $headers['Device-Stock-UA'] : '';
-			$xDeviceUserAgent = isset($headers['X-Device-User-Agent']) ? $headers['X-Device-User-Agent'] : '';
-			$xOriginalUserAgent = isset($headers['X-Original-User-Agent']) ? $headers['X-Original-User-Agent'] : '';
-			$xOperaMiniPhoneUA = isset($headers['X-OperaMini-Phone-UA']) ? $headers['X-OperaMini-Phone-UA'] : '';
+			$filteredHeaders = '';
+
+			foreach($headers as $key => $value) {
+				if (!in_array(strtolower($key), array(
+					'accept', 'host', 'connection', 'dnt', 'user-agent', 'accept-encoding', 'accept-language', 
+					'accept-charset', 'referer', 'cookie', 'content-type', 'content-length', 'content-transfer-encoding', 
+					'origin', 'pragma', 'cache-control', 'via', 'clientip', 'x-bluecoat-via', 'x-piper-id',
+					'x-forwarded-for', 'x-teacup', 'x-saucer', 'isajaxrequest', 'keep-alive', 'max-forwards',
+					'xroxy-connection', 'client-ip', 'cookie2', 'x-via', 'x-imforwards', 'http-client-id',
+					'x-proxy-id', 'z-forwarded-for', 'expect', 'x-ip-address', 'x-rbt-optimized-by', 'qpr-loop',
+					'cuda_cliip', 'x-source-id', 'x-clickoncesupport'
+				))) {
+					$filteredHeaders .= $key . ": " . $value . "\n";
+				}
+			}
+			
+			if (!$readonly && intval($payload->version) >= 4) {
+				$useragentHeader = $_SERVER['HTTP_USER_AGENT'];
+				$useragentId = preg_replace("/(; ?)[a-z][a-z](?:-[a-zA-Z][a-zA-Z])?([;)])/", '$1xx$2', $useragentHeader);
 			
-			if (!$readonly) {
 				mysql_query('
 					INSERT INTO 
 						results
@@ -116,17 +129,27 @@
 						deviceHeight = "' . mysql_real_escape_string($payload->deviceHeight) . '",
 						deviceType = "' . mysql_real_escape_string($payload->deviceType) . '",
 						useragent = "' . mysql_real_escape_string($payload->useragent) . '",
+						useragentHeader = "' . mysql_real_escape_string($useragentHeader) . '",
+						useragentId = "' . mysql_real_escape_string(md5($useragentId)) . '",
 						humanReadable = "' . mysql_real_escape_string($payload->humanReadable) . '",
-						xWapProfile = "' . mysql_real_escape_string($xWapProfile) . '",
-						xDeviceStockUA = "' . mysql_real_escape_string($xDeviceStockUA) . '",
-						xDeviceUserAgent = "' . mysql_real_escape_string($xDeviceUserAgent) . '",
-						xOriginalUserAgent = "' . mysql_real_escape_string($xOriginalUserAgent) . '",
-						xOperaMiniPhoneUA = "' . mysql_real_escape_string($xOperaMiniPhoneUA) . '",
+						headers = "' . mysql_real_escape_string($filteredHeaders) . '",
 						results = "' . mysql_real_escape_string($payload->results) . '",
 						points = "' . mysql_real_escape_string($payload->points) . '",
 						fingerprint = "' . mysql_real_escape_string(md5($payload->results.$payload->points)) . '",
 						status = 0
 				');
+
+				mysql_query('
+					INSERT INTO 
+						fingerprints
+					SET 
+						fingerprint = "' . mysql_real_escape_string(md5($payload->results.$payload->points)) . '",
+						version = "' . mysql_real_escape_string($payload->version) . '",
+						score = "' . mysql_real_escape_string($payload->score) . '",
+						bonus = "' . mysql_real_escape_string($payload->bonus) . '",
+						results = "' . mysql_real_escape_string($payload->results) . '",
+						points = "' . mysql_real_escape_string($payload->points) . '"
+				');
 			}
 
 			break;
@@ -162,4 +185,43 @@
 			}
 
 			break;
+
+
+			
+		case 'uasimplify':
+			$res = mysql_query("
+				SELECT 
+					DISTINCT useragentHeader
+				FROM
+					results
+				WHERE
+					useragentId = ''
+			");
+
+			header ('Content-type: text/html');
+
+			echo "<table style='font-family: sans-serif' border=1>";
+			while ($row = mysql_fetch_object($res)) {
+				$ua = preg_replace("/(; ?)[a-z][a-z](?:-[a-zA-Z][a-zA-Z])?([;)])/", '$1xx$2', $row->useragentHeader);
+			
+				echo "<tr>";
+				echo "<td>" . $row->useragentHeader . "</td>";
+				echo "<td>" . $ua . "</td>";
+				echo "</tr>";
+				
+				mysql_query("
+					UPDATE
+						results
+					SET
+						useragentId = '" . md5($row->useragentId) . "' 
+					WHERE
+						useragentHeader = '" . $row->useragentHeader . "'
+				");
+
+			}
+
+			echo "</table>";
+
+		
+			break;
 	}
diff --git a/backend/results.php b/backend/results.php
index 938d50fc..cee17a26 100644
--- a/backend/results.php
+++ b/backend/results.php
@@ -18,12 +18,12 @@
 
 	$res = mysql_query("
 		SELECT 
-			b.status, b.unique, b.nickname, b.details, b.description, s.score, s.bonus, s.points, s.results 
+			b.status, b.unique, b.nickname, b.details, b.description, f.score, f.bonus, f.points, f.results 
 		FROM 
-			browsers AS b, 
-			scores AS s 
+			browsers AS b
+			LEFT JOIN scores AS s ON (b.unique = s.id)
+			LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
 		WHERE 
-			b.unique = s.id AND 
 			b.listed = 1 AND
 			s.version = '" . $version . "' AND
 			FIND_IN_SET('" . $type . "',type)
@@ -37,9 +37,9 @@
 
 	
 	$tpl->set('results', $results);
-	if (count($results['current']) > 0) $tpl->set('first', $results['current'][0]);
-	if (count($results['current']) > 1) $tpl->set('runnerup', $results['current'][1]);
-	if (count($results['development']) > 0) $tpl->set('upcoming', $results['development'][0]);
+	if (isset($results['current']) && count($results['current']) > 0) $tpl->set('first', $results['current'][0]);
+	if (isset($results['current']) && count($results['current']) > 1) $tpl->set('runnerup', $results['current'][1]);
+	if (isset($results['development']) && count($results['development']) > 0) $tpl->set('upcoming', $results['development'][0]);
 	
 	
 	
@@ -48,19 +48,22 @@
 
 	$res = mysql_query("
 		SELECT 
-			b.grouped, b.unique, b.nickname, b.details, IF(ISNULL(b.release),DATE(NOW()),b.release) AS `release`, b.status, s.score
+			b.grouped, b.unique, b.nickname, b.details, IF(ISNULL(b.release),DATE(NOW()),b.release) AS `release`, b.status, f.score
 		FROM 
-			browsers AS b, 
-			scores AS s 
+			browsers AS b
+			LEFT JOIN scores AS s ON (b.unique = s.id)
+			LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
 		WHERE 
-			b.unique = s.id AND 
 			(!ISNULL(b.release) OR b.status = 'development') AND
 			s.version = '" . $version . "' AND
-			FIND_IN_SET('" . $type . "',type)
+			FIND_IN_SET('" . $type . "',type) AND
+			!ISNULL(f.score)
 		ORDER BY 
 			b.grouped, `release`
 	");
 	
+	echo mysql_error();
+	
 	while ($row = mysql_fetch_object($res)) {
 		$sets[$row->grouped]['name'] = $row->grouped;
 		$sets[$row->grouped]['data'][] = $row;

From 63fe8be7a145f268d65f1c2e3d8ec1241d9d5d58 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 10:49:53 +0200
Subject: [PATCH 104/174] Bugfix with unknown data

---
 backend/templates/browser.html        |    6 +-
 backend/templates/feature.html        |    6 +-
 scripts/template.js                   |    4 +-
 scripts/useragents/detect.js          |   13 +-
 scripts/useragents/useragents.lib.php | 1478 +++++++++++++++++++++----
 5 files changed, 1254 insertions(+), 253 deletions(-)

diff --git a/backend/templates/browser.html b/backend/templates/browser.html
index 3a177a83..0133f29a 100644
--- a/backend/templates/browser.html
+++ b/backend/templates/browser.html
@@ -90,15 +90,15 @@ <h3 data-i18n>About these scores</h3>
 										}	
 					});
 					
-				<?php if ($one != ''): ?> 
+				<?php if (isset($one) && $one != ''): ?> 
 					table.updateColumn(0, <?php echo $one; ?>);
 				<?php endif; ?>
 				
-				<?php if ($two != ''): ?> 
+				<?php if (isset($two) && $two != ''): ?> 
 					table.updateColumn(1, <?php echo $two; ?>);
 				<?php endif; ?>
 				
-				<?php if ($three != ''): ?> 
+				<?php if (isset($three) && $three != ''): ?> 
 					table.updateColumn(2, <?php echo $three; ?>);
 				<?php endif; ?>
 				
diff --git a/backend/templates/feature.html b/backend/templates/feature.html
index fdfdfeef..a91c7800 100644
--- a/backend/templates/feature.html
+++ b/backend/templates/feature.html
@@ -82,15 +82,15 @@ <h3 data-i18n>About these scores</h3>
 										}	
 					});
 					
-				<?php if ($one != ''): ?> 
+				<?php if (isset($one) && $one != ''): ?> 
 					table.updateColumn(0, <?php echo $one; ?>);
 				<?php endif; ?>
 				
-				<?php if ($two != ''): ?> 
+				<?php if (isset($two) && $two != ''): ?> 
 					table.updateColumn(1, <?php echo $two; ?>);
 				<?php endif; ?>
 				
-				<?php if ($three != ''): ?> 
+				<?php if (isset($three) && $three != ''): ?> 
 					table.updateColumn(2, <?php echo $three; ?>);
 				<?php endif; ?>
 										
diff --git a/scripts/template.js b/scripts/template.js
index 5af8219e..bf4d6033 100644
--- a/scripts/template.js
+++ b/scripts/template.js
@@ -35,8 +35,8 @@
 
 
 var tim = (function(){
-    var starts  = "{{",
-        ends    = "}}",
+    var starts  = "\\{\\{",
+        ends    = "\\}\\}",
         path    = "[a-z0-9_][\\.a-z0-9_]*", // e.g. config.person.name
         pattern = new RegExp(starts + "("+ path +")" + ends, "gim"),
         undef;
diff --git a/scripts/useragents/detect.js b/scripts/useragents/detect.js
index 354cab21..0853188e 100644
--- a/scripts/useragents/detect.js
+++ b/scripts/useragents/detect.js
@@ -71,7 +71,7 @@ var UserAgents = (function(){
 		},
 		
 		valueOf: function() {
-			return parseFloat('' + this.major + '.' + ('0000' + this.minor).slice(-4));
+			return parseFloat('' + this.major + '.' + ('0000' + this.minor).slice(-4) + ('0000' + this.revision).slice(-4));
 		},
 		
 		toString: function() {
@@ -106,6 +106,7 @@ var UserAgents = (function(){
 			return version;
 		}
 	}
+	
 
  	var Detected = function() { this.initialize.apply(this, arguments) };
 	Detected.prototype = {
@@ -160,9 +161,15 @@ var UserAgents = (function(){
 			if (ua == 'Mozilla/5.0 (X11; U; Linux i686; zh-CN; rv:1.2.3.4) Gecko/') {
 				if (this.browser.name != 'UC Browser') {
 					this.browser.name = 'UC Browser';
+					this.browser.version = null;
 					this.engine.name = 'Gecko';
 				}
 				
+				if (this.os.name == 'Windows') {
+					this.os.name = '';
+					this.os.version = null;
+				}
+				
 				this.engine.name = 'Gecko';
 				this.engine.version = null;
 				
@@ -224,7 +231,7 @@ var UserAgents = (function(){
 				}
 
 
-				if (this.options.useFeatures) {
+				if (this.options.useFeatures && this.browser.mode != 'proxy') {
 					/* If it claims not to be Trident, but it is probably Trident running camouflage mode */
 					if (window.ActiveXObject) {
 						this.features.push('trident');		
@@ -285,7 +292,6 @@ var UserAgents = (function(){
 					}
 	
 	
-	
 					/* If we have an iPad that is not 768 x 1024, we have an imposter */
 					if (this.device.model == 'iPad') {
 						if ((screen.width != 0 && screen.height != 0) && (screen.width != 768 && screen.height != 1024) && (screen.width != 1024 && screen.height != 768)) {
@@ -415,6 +421,5 @@ var UserAgents = (function(){
 		}
 	};
 
-
 	return Detected;
 })();	
diff --git a/scripts/useragents/useragents.lib.php b/scripts/useragents/useragents.lib.php
index 5969a520..7453ef6c 100644
--- a/scripts/useragents/useragents.lib.php
+++ b/scripts/useragents/useragents.lib.php
@@ -34,11 +34,95 @@
 	define ('TYPE_EMULATOR', 'emulator');
 	define ('TYPE_TELEVISION', 'television');
 	define ('TYPE_CAMERA', 'camera');
+	define ('TYPE_SIGNAGE', 'signage');
+	define ('TYPE_WHITEBOARD', 'whiteboard');
+	define ('TYPE_CAR', 'car');
 	define ('TYPE_POS', 'pos');
+	define ('TYPE_BOT', 'bot');
 
 	define ('FLAG_GOOGLETV', 1);
 
 	
+	class BrowserIds {
+		static $ANDROID_BROWSERS = array(
+//			com.android.browser
+//			com.google.android.browser
+
+			'com.qihoo.browser'									=> '360 Phone Browser',
+			'net.adgjm.angel'									=> 'Angel Browser',
+			'com.apc.browser'									=> 'APC',
+			'com.baidu.browser.apps'							=> 'Baidu Browser',
+			'com.baidu.browser.inter'							=> 'Baidu Browser',
+			'com.baidu.searchbox'								=> 'Baidu Browser',
+			'com.boatbrowser.free'								=> 'Boat Browser',
+			'com.boatgo.browser'								=> 'Boat Browser Mini',
+			'com.ericsson.research.mario'						=> 'Bowser',
+			'mobi.mgeek.TunnyBrowser'							=> 'Dolphin',
+			'com.dolphin.browser.android.jp'					=> 'Dolphin',
+			'com.dolphin.browser.pad'							=> 'Dolphin',
+			'com.dolphin.browser.lab.cn'						=> 'Dolphin Beta',
+			'com.dolphin.browser.lab.en'						=> 'Dolphin Beta',
+			'com.dolphin.browser.cn'							=> 'Dolphin Mini',
+			'com.dolphin.browser.en'							=> 'Dolphin Mini',
+			'easy.browser.classic'								=> 'Easy Browser',
+			'easy.browser.com'									=> 'Easy Browser',
+			'it.blogspot.fedeveloper'							=> 'Emergency Browser',	
+			'gpc.myweb.hinet.net.PopupWeb'						=> 'Floating Browser Flux',
+			'galaxy.browser.gb.free'							=> 'Galaxy Browser',
+			'galaxy.browser.gb.pro'								=> 'Galaxy Browser',
+			'jp.ddo.pigsty.Habit_Browser'						=> 'Habit Browser',
+			'com.adsi.kioware.client.mobile.app'				=> 'KioWare Kiosk',
+			'com.vng.android.zingbrowser'						=> 'Laban',
+			'acr.browser.barebones'								=> 'Lightning Browser',
+			'com.mx.browser'									=> 'Maxthon',
+			'com.mx.browser.tablet'								=> 'Maxthon',
+			'com.fevdev.nakedbrowser'							=> 'Naked Browser',
+			'com.nhn.android.search'							=> 'Naver',
+			'com.access_company.android.nflifebrowser.lite'		=> 'NetFront LifeBrowser',
+			'com.ninesky.browser'								=> 'Ninesky',
+			'com.compal.android.browser'						=> 'Ocean Browser',
+			'com.tencent.ibibo.mtt'								=> 'One Browser',
+			'info.guardianproject.browser'						=> 'Orweb',	
+			'com.appsverse.photon'								=> 'Photon Browser',
+			'com.tencent.international.mtt'						=> 'QQ Browser',
+			'com.tencent.mobileqq'								=> 'QQ Browser',
+			'com.tencent.padbrowser'							=> 'QQ Browser',
+			'com.skyfire.consumer.browser'						=> 'Skyfire',
+			'jp.co.fenrir.android.sleipnir'						=> 'Sleipnir',
+			'jp.co.fenrir.android.sleipnir_test'				=> 'Sleipnir',
+			'com.mns.android.swing'								=> 'Swing Browser',
+			'org.tint'											=> 'Tint Browser',
+			'com.UCMobile'										=> 'UC Browser',
+			'com.UCMobile.intl'									=> 'UC Browser',
+			'com.uc.browser.hd'									=> 'UC Browser',
+			'com.uc.browser.en'									=> 'UC Browser Mini',
+			'sui.mRelease'										=> 'xScope Browser Pro',
+			'org.zirco'											=> 'Zirco Browser',
+			
+			'com.jv.falcon.pro'									=> 'Falcon Pro',
+			'com.noinnion.android.greader.readerpro'			=> 'gReader Pro',
+			'com.levelup.touiteur'								=> 'Plume',
+			'com.andrewshu.android.redditdonation'				=> 'Reddit is fun',
+			'com.sina.weibo'									=> 'Sina Weibo'
+		);
+
+		function identify($type, $model) {
+			switch($type) {
+				case 'android':		return BrowserIds::identifyList(BrowserIds::$ANDROID_BROWSERS, $model);
+			}
+
+			return false;
+		}
+		
+		function identifyList($list, $id) {
+			if (isset($list[$id])) {
+				return $list[$id];
+			}
+			
+			return false;
+		}
+	}
+	
 	class DeviceModels {
 		static $ANDROID_MODELS = array(
 			/* Generic identifiers */
@@ -53,6 +137,7 @@ class DeviceModels {
 			'Amlogic M1 reference board'				=> array( 'Amlogic', 'M1 reference board' ),
 			'AML8726M'									=> array( 'Amlogic', 'AML8726-M based device' ),
 			'vexpress a9'								=> array( 'ARM', 'Versatile Express development platform' ),
+			'sama5d3'									=> array( 'Atmel', 'SAMA5D3 based device' ),
 			'bcm7231'									=> array( 'Broadcom', 'BCM7231 based device', TYPE_TELEVISION ),
 			'bcm7425'									=> array( 'Broadcom', 'BCM7425 based device', TYPE_TELEVISION ),
 			'bcm7429'									=> array( 'Broadcom', 'BCM7429 based device', TYPE_TELEVISION ),
@@ -60,8 +145,12 @@ class DeviceModels {
 			'imx51!'									=> array( 'Freescale', 'i.MX51 based device' ),
 			'imx53!'									=> array( 'Freescale', 'i.MX53 based device' ),
 			'imx6q!'									=> array( 'Freescale', 'i.MX6Q based device' ),
+			'SABRESD-MX6DQ'								=> array( 'Freescale', 'i.MX6DQ based device' ),
 			'ODROID-A'									=> array( 'Hardkernel', 'ODROID-A developer tablet', TYPE_TABLET ),
+			'ODROID-U2'									=> array( 'Hardkernel', 'ODROID-U2 developer board' ),
 			'mfld (dv10|dv20|lw00|pr2|pr3)!'			=> array( 'Intel', 'Medfield based device' ),
+			'redhookbay'								=> array( 'Intel', 'Merrifield based device' ),
+			'Shark Bay Client platform'					=> array( 'Intel', 'Haswell based device' ),
 			'berlin bg2'								=> array( 'Marvell', 'Armada 1000 based device', TYPE_TELEVISION ),
 			'MStar Amber3'								=> array( 'MStar', 'Amber3 based device' ),
 			'Konka Amber3'								=> array( 'MStar', 'Amber3 based device' ),
@@ -69,6 +158,7 @@ class DeviceModels {
 			'bird75v2'									=> array( 'Mediatek', 'MT6575 based device' ),
 			'eagle75v1 2'								=> array( 'Mediatek', 'MT6575 based device' ),
 			'mt6575!'									=> array( 'Mediatek', 'MT6575 based device' ),		
+			'mt6589!'									=> array( 'Mediatek', 'MT6589 based device' ),		
 			'mt8658'									=> array( 'Mediatek', 'MT8658 based device' ),
 			'MBX DVBT reference board (c03ref)'			=> array( 'MXB', 'DVBT reference board', TYPE_TELEVISION ),
 			'NS115' 									=> array( 'Nufront', 'NuSmart 115 based device' ),
@@ -106,6 +196,7 @@ class DeviceModels {
 			'LogicPD Zoom2'								=> array( 'Texas Instruments', 'OMAP based device' ),
 			'omap3evm'									=> array( 'Texas Instruments', 'OMAP3 based device' ),
 			'Omap5sevm'									=> array( 'Texas Instruments', 'OMAP5 based device' ),
+			'AM335XEVM SK'								=> array( 'Texas Instruments', 'Sitara AM335 based device' ),
 			'pnx8473 kiryung'							=> array( 'Trident', 'PNX8473 based device', TYPE_TELEVISION ),
 			
 			/* Official Google development devices */
@@ -131,7 +222,7 @@ class DeviceModels {
 			'Galaxy Nexus'								=> array( 'Samsung', 'Galaxy Nexus' ),
 			'Grouper'									=> array( 'Asus', 'Nexus 7', TYPE_TABLET ),
 			'(Google )?Nexus 7!'						=> array( 'Asus', 'Nexus 7', TYPE_TABLET ),
-			'Nexus 4'									=> array( 'LG', 'Nexus 4' ),
+			'(Google )?Nexus 4!'						=> array( 'LG', 'Nexus 4' ),
 			'manta'										=> array( 'Samsung', 'Nexus 10', TYPE_TABLET ),
 			'Nexus 10'									=> array( 'Samsung', 'Nexus 10', TYPE_TABLET ),
 
@@ -140,10 +231,31 @@ class DeviceModels {
 			'BlueStacks'								=> array( 'BlueStacks', 'App Player', 'desktop' ),
 			'youwave custom'							=> array( 'Youwave', 'Android on PC', 'desktop' ),
 			'BlackBerry Runtime for Android Apps'		=> array( 'RIM', 'BlackBerry (Android Runtime)', TYPE_MOBILE ),
+			'BlackBerry Runtime for Android Apps'		=> array( 'RIM', 'BlackBerry (Android Runtime)', TYPE_MOBILE ),
+			'full Android on Microsoft Windows, pad, pc, n*books'	
+														=> array( 'SocketeQ', 'WindowsAndroid', 'desktop' ),
+
+			/* TV sticks */
+			'MK808'										=> array( null, 'MK808', TYPE_TELEVISION ),
+			'MK808B'									=> array( null, 'MK808B', TYPE_TELEVISION ),
+			'GK802'										=> array( null, 'GK802', TYPE_TELEVISION ),
+			'VEOLO'										=> array( 'A.C. Ryan', 'VEOLO Smart Android Hub', TYPE_TELEVISION ),
+			'M3 Enjoy TV Box'							=> array( 'Geniatech', 'Enjoy TV', TYPE_TELEVISION ),
+			'Rikomagic MK802'							=> array( 'Rikomagic', 'MK802', TYPE_TELEVISION ),
+			'Rikomagic MK802II'							=> array( 'Rikomagic', 'MK802 II', TYPE_TELEVISION ),
+			'Rikomagic MK802III'						=> array( 'Rikomagic', 'MK802 III', TYPE_TELEVISION ),	
+			'Rikomagic MK802IIIS'						=> array( 'Rikomagic', 'MK802 IIIS', TYPE_TELEVISION ),	
+			'XW-I8'										=> array( 'Sambao', 'XW-I8', TYPE_TELEVISION ),
+			'TCC8925 HDMI DONGLE'						=> array( 'Telechips', 'TCC8925', TYPE_TELEVISION ),
+			'TCC8930 STB EV'							=> array( 'Telechips', 'TCC8930', TYPE_TELEVISION ),
+
 			
 			/* Regular devices */
+			'BC9710A'									=> array( '3Q', 'Qoo! Q-Pad BC9710A', TYPE_TABLET ),
 			'RC0710B'									=> array( '3Q', 'Qoo! Q-Pad RC0710B', TYPE_TABLET ),
+			'QS9718C'									=> array( '3Q', 'Qoo! Q-Pad QS9718C', TYPE_TABLET ),
 			'TS1009B'									=> array( '3Q', 'Qoo! Surf Tablet TS1009B', TYPE_TABLET ),
+			'VM0711A'									=> array( '3Q', 'Qoo! Surf Tablet VM0711A', TYPE_TABLET ),
 			'aspire1000s'								=> array( 'Acer', '1000 Series', TYPE_DESKTOP ),
 			'A100'										=> array( 'Acer', 'Iconia Tab A100', TYPE_TABLET ),
 			'A101'										=> array( 'Acer', 'Iconia Tab A101', TYPE_TABLET ),
@@ -159,6 +271,7 @@ class DeviceModels {
 			'P2A700'									=> array( 'Acer', 'Iconia Tab A700', TYPE_TABLET ),
 			'A701'										=> array( 'Acer', 'Iconia Tab A701', TYPE_TABLET ),
 			'A800'										=> array( 'Acer', 'Iconia Tab A800', TYPE_TABLET ),
+			'B1-A71'									=> array( 'Acer', 'Iconia B1-A71', TYPE_TABLET ),
 			'E110'										=> array( 'Acer', 'beTouch E110' ),
 			'E120'										=> array( 'Acer', 'beTouch E120' ),
 			'E130'										=> array( 'Acer', 'beTouch E130' ),
@@ -183,40 +296,77 @@ class DeviceModels {
 			'Liquid Metal'								=> array( 'Acer', 'Liquid mt' ),
 			'Stream'									=> array( 'Acer', 'Stream' ),
 			'AK330s'									=> array( 'Acer', 'AK330s' ),
+			'T1-B'										=> array( 'Advan', 'Vandroid T1-B', TYPE_TABLET ),
+			'VegaBean!'									=> array( 'Advent', 'Vega', TYPE_TABLET ),
 			'N700'										=> array( 'aigo', 'N700', TYPE_TABLET ),
 			'M801'										=> array( 'aigo', 'M801', TYPE_TABLET ),
 			'Novo7'										=> array( 'Ainovo', 'Novo7', TYPE_TABLET ),
 			'Novo7 Aurora'								=> array( 'Ainovo', 'Novo7 Aurora', TYPE_TABLET ),
+			'Ainovo Aurora-II'							=> array( 'Ainovo', 'Novo7 Aurora II', TYPE_TABLET ),
+			'Aurora-II'									=> array( 'Ainovo', 'Novo7 Aurora II', TYPE_TABLET ),
 			'Novo7 Advanced'							=> array( 'Ainovo', 'Novo7 Advanced', TYPE_TABLET ),
 			'Novo7 Advanced2'							=> array( 'Ainovo', 'Novo7 Advanced 2', TYPE_TABLET ),
 			'Novo7 Basic'								=> array( 'Ainovo', 'Novo7 Basic', TYPE_TABLET ),
+			'NovoCrystal'								=> array( 'Ainovo', 'Novo7 Crystal', TYPE_TABLET ),
 			'Novo7 ELF'									=> array( 'Ainovo', 'Novo7 Elf', TYPE_TABLET ),
+			'ELF-II'									=> array( 'Ainovo', 'Novo7 Elf II', TYPE_TABLET ),
 			'Novo7 Fire'								=> array( 'Ainovo', 'Novo7 Fire', TYPE_TABLET ),
 			'Novo7 Flame'								=> array( 'Ainovo', 'Novo7 Flame', TYPE_TABLET ),
 			'Ainovo Flame (Nexus 7)'					=> array( 'Ainovo', 'Novo7 Flame', TYPE_TABLET ),
+			'Novo7 Legend'								=> array( 'Ainovo', 'Novo7 Legend', TYPE_TABLET ),
 			'Novo7 PALADIN'								=> array( 'Ainovo', 'Novo7 Paladin', TYPE_TABLET ),
+			'Novo7 Venus'								=> array( 'Ainovo', 'Novo7 Venus', TYPE_TABLET ),
 			'Novo8 Advanced'							=> array( 'Ainovo', 'Novo8 Advanced', TYPE_TABLET ),
+			'novo9-Spark'								=> array( 'Ainovo', 'Novo9 Spark', TYPE_TABLET ),
 			'Novo10 Hero'								=> array( 'Ainovo', 'Novo10 Hero', TYPE_TABLET ),
+			'Novo 10 Hero QuadCore'						=> array( 'Ainovo', 'Novo10 Hero', TYPE_TABLET ),
 			'one touch 890!'							=> array( 'Alcatel', 'One Touch 890' ),
 			'one touch 891!'							=> array( 'Alcatel', 'One Touch 891' ),
 			'one touch 903!'							=> array( 'Alcatel', 'One Touch 903' ),
 			'one touch 906!'							=> array( 'Alcatel', 'One Touch 906' ),
 			'one touch 908!'							=> array( 'Alcatel', 'One Touch 908' ),
+			'one touch 909!'							=> array( 'Alcatel', 'One Touch 909' ),
 			'one touch 910!'							=> array( 'Alcatel', 'One Touch 910' ),
+			'one touch 916!'							=> array( 'Alcatel', 'One Touch 916' ),
 			'one touch 918!'							=> array( 'Alcatel', 'One Touch 918' ),
+			'one touch 927!'							=> array( 'Alcatel', 'One Touch 927' ),
+			'one touch 928!'							=> array( 'Alcatel', 'One Touch 928' ),
+			'one touch 930!'							=> array( 'Alcatel', 'One Touch 930' ),
 			'one touch 979!'							=> array( 'Alcatel', 'One Touch 979' ),
 			'one touch 980!'							=> array( 'Alcatel', 'One Touch 980' ),
 			'one touch 981!'							=> array( 'Alcatel', 'One Touch 981' ),
+			'one touch 983!'							=> array( 'Alcatel', 'One Touch 983' ),
 			'one touch 985!'							=> array( 'Alcatel', 'One Touch 985' ),
 			'one touch 986!'							=> array( 'Alcatel', 'One Touch 986' ),
 			'one touch 990!'							=> array( 'Alcatel', 'One Touch 990' ),
 			'one touch 991!'							=> array( 'Alcatel', 'One Touch 991' ),
+			'one touch 992!'							=> array( 'Alcatel', 'One Touch 992' ),
 			'one touch 993!'							=> array( 'Alcatel', 'One Touch 993' ),
 			'one touch 995!'							=> array( 'Alcatel', 'One Touch 995' ),
 			'one touch 997!'							=> array( 'Alcatel', 'One Touch 997' ),
-			'Telenor OneTouch'							=> array( 'Alcatel', 'One Touch 990' ),
 			'OT 918'									=> array( 'Alcatel', 'One Touch 918' ),
+			'OT-995'									=> array( 'Alcatel', 'One Touch 995' ),
+			'one touch 4010X'							=> array( 'Alcatel', 'One Touch 4010X' ),
+			'one touch 4030D'							=> array( 'Alcatel', 'One Touch 4030D' ),
+			'one touch 4030E'							=> array( 'Alcatel', 'One Touch 4030E' ),
+			'one touch 5020A'							=> array( 'Alcatel', 'One Touch 5020A' ),
+			'one touch 5020W'							=> array( 'Alcatel', 'One Touch 5020W' ),
+			'one touch 5020X'							=> array( 'Alcatel', 'One Touch 5020X' ),
+			'one touch 5035A'							=> array( 'Alcatel', 'One Touch 5035A' ),
+			'one touch 6010X'							=> array( 'Alcatel', 'One Touch 6010X' ),
+			'one touch 6030A'							=> array( 'Alcatel', 'One Touch 6030A' ),
+			'one touch 6030X'							=> array( 'Alcatel', 'One Touch 6030X' ),
+			'one touch 6033X'							=> array( 'Alcatel', 'One Touch 6033X' ),
+			'one touch 7025D'							=> array( 'Alcatel', 'One Touch 7025D' ),
+			'one touch 7025X'							=> array( 'Alcatel', 'One Touch 7025X' ),
+			'one touch 7030L'							=> array( 'Alcatel', 'One Touch 7030L' ),
+			'one touch 7030R'							=> array( 'Alcatel', 'One Touch 7030R' ),
+			'one touch T10'								=> array( 'Alcatel', 'One Touch T10', TYPE_TABLET ),
+			'onetouch EVO7'								=> array( 'Alcatel', 'One Touch Evo 7', TYPE_TABLET ),
 			'Venture'									=> array( 'Alcatel', 'Venture' ),
+			'ALLVIEW P4i'								=> array( 'Allview', 'P4 Duo' ),
+			'Allview P5-Mini'							=> array( 'Allview', 'P5 Mini' ),
+			'A10'										=> array( 'AllWinner', 'A10', TYPE_TABLET ),
 			'Allwinner A10'								=> array( 'AllWinner', 'A10', TYPE_TABLET ),
 			'97FC'										=> array( 'AllWinner', 'A10 97FC', TYPE_TABLET ),
 			'A13-?MID!'									=> array( 'AllWinner', 'A13', TYPE_TABLET ),
@@ -225,24 +375,42 @@ class DeviceModels {
 			'KFOT'										=> array( 'Amazon', 'Kindle Fire', TYPE_TABLET ),	
 			'KFTT'										=> array( 'Amazon', 'Kindle Fire HD 7"', TYPE_TABLET ),
 			'KFJW(I|A)!'								=> array( 'Amazon', 'Kindle Fire HD 8.9"', TYPE_TABLET ),
+			'AMOI N79+'									=> array( 'Amoi', 'N79' ),
 			'AMOI N89'									=> array( 'Amoi', 'N89' ),
+			'AMOI N808'									=> array( 'Amoi', 'N808' ),
+			'AMOI N816'									=> array( 'Amoi', 'N816' ),
 			'AMOI N820'									=> array( 'Amoi', 'N820' ),
 			'AMOI N821'									=> array( 'Amoi', 'N821' ),
+			'AMOI N828'									=> array( 'Amoi', 'N828' ),
+			'AMOI N850'									=> array( 'Amoi', 'N850' ),
+			'AMOI M8228'								=> array( 'Amoi', 'M8228' ),
 			'AMD120'									=> array( 'AnyDATA', 'AnyTAB AMD120', TYPE_TABLET ),
+			'mw07'										=> array( 'AOC', 'Breeze MW07', TYPE_TABLET ),
 			'MW0711'									=> array( 'AOC', 'Breeze MW0711', TYPE_TABLET ),
 			'MW0811'									=> array( 'AOC', 'Breeze MW0811', TYPE_TABLET ),
+			'MW0812'									=> array( 'AOC', 'Breeze MW0812', TYPE_TABLET ),
 			'MW0821 V2.0'								=> array( 'AOC', 'Breeze MW0821', TYPE_TABLET ),
 			'MW0922'									=> array( 'AOC', 'Breeze MW0922', TYPE_TABLET ),
 			'AOLE 828'									=> array( 'Aole', '828' ),
+			'M19'										=> array( 'Aoson', 'M19', TYPE_TABLET ),
+			'Aoson M19'									=> array( 'Aoson', 'M19', TYPE_TABLET ),
 			'Apanda.A60!'								=> array( 'Apanda', 'A60' ),
 			'apanda-A80S'								=> array( 'Apanda', 'A80' ),
 			'Quicki-811'								=> array( 'Apollo', 'Quicki-811', TYPE_TABLET ),
-			'A80KSC!'									=> array( 'Archos', 'Arnova 8', TYPE_TABLET ),
-			'AN7CG2'									=> array( 'Archos', 'Arnova 7', TYPE_TABLET ),
+			'AN7CG2'									=> array( 'Archos', 'Arnova 7c G2', TYPE_TABLET ),
 			'AN7G3'										=> array( 'Archos', 'Arnova 7 G3', TYPE_TABLET ),
+			'AN7DG3-CP'									=> array( 'Archos', 'Arnova 7d G3', TYPE_TABLET ),
+			'AN7FG3'									=> array( 'Archos', 'Arnova 7f G3', TYPE_TABLET ),
+			'AN7HG3'									=> array( 'Archos', 'Arnova 7h G3', TYPE_TABLET ),
+			'A80KSC!'									=> array( 'Archos', 'Arnova 8', TYPE_TABLET ),
+			'AN8G3'										=> array( 'Archos', 'Arnova 8 G3', TYPE_TABLET ),
+			'AN9G2'										=> array( 'Archos', 'Arnova 9 G2', TYPE_TABLET ),
 			'A101B'										=> array( 'Archos', 'Arnova 10', TYPE_TABLET ),
-			'AN10BG2DT'									=> array( 'Archos', 'Arnova 10 B', TYPE_TABLET ),
 			'AN10G2'									=> array( 'Archos', 'Arnova 10 G2', TYPE_TABLET ),
+			'AN10BG2DT'									=> array( 'Archos', 'Arnova 10b G2', TYPE_TABLET ),
+			'AN10BG3'									=> array( 'Archos', 'Arnova 10b G3', TYPE_TABLET ),
+			'AN10CG3'									=> array( 'Archos', 'Arnova 10c G3', TYPE_TABLET ),
+			'AN10DG3'									=> array( 'Archos', 'Arnova 10d G3', TYPE_TABLET ),
 			'A32'										=> array( 'Archos', '32', 'media' ),
 			'A35DE'										=> array( 'Archos', '35 Smart Home Phone' ),
 			'A43'										=> array( 'Archos', '43', 'media' ),
@@ -258,14 +426,19 @@ class DeviceModels {
 			'ARCHOS 80G9'								=> array( 'Archos', '80 G9', TYPE_TABLET ),							// G9
 			'ARCHOS 101G9'								=> array( 'Archos', '101 G9', TYPE_TABLET ),						
 			'ARCHOS 97XSLG10'							=> array( 'Archos', '97 XS', TYPE_TABLET ),							// G10
+			'ARCHOS 80XSK'								=> array( 'Archos', '80 XS', TYPE_TABLET ),							// G10
 			'ARCHOS 101G10'								=> array( 'Archos', '101 XS', TYPE_TABLET ),
 			'ARCHOS 80 COBALT'							=> array( 'Archos', '80 Cobalt', TYPE_TABLET ),						// Elements
+			'ARCHOS 80 TITANIUM'						=> array( 'Archos', '80 Titanium', TYPE_TABLET ),					// Elements
 			'ARCHOS 97 CARBON'							=> array( 'Archos', '97 Carbon', TYPE_TABLET ),						// Elements
+			'ARCHOS 97 TITANIUMHD'						=> array( 'Archos', '97 Titanium HD', TYPE_TABLET ),				// Elements
+			'ARCHOS GAMEPAD'							=> array( 'Archos', 'Gamepad', TYPE_GAMING ),
 			'D9702'										=> array( 'Artes', 'D9702', TYPE_TABLET ),
 			'ASTRI'										=> array( 'ASTRI', 'e-reader', TYPE_EREADER ),
 			'eeepc'										=> array( 'Asus', 'Eee Pc' ),
 			'asus laptop'								=> array( 'Asus', 'Eee Pc' ),
 			'ME171'										=> array( 'Asus', 'Eee Pad MeMO', TYPE_TABLET ),
+			'ME172V'									=> array( 'Asus', 'MemoPad ME172V', TYPE_TABLET ),
 			'Slider SL101'								=> array( 'Asus', 'Eee Pad Slider', TYPE_TABLET ),
 			'EPAD'										=> array( 'Asus', 'Eee Pad Transformer', TYPE_TABLET ),
 			'TF101'										=> array( 'Asus', 'Eee Pad Transformer', TYPE_TABLET ),
@@ -276,12 +449,20 @@ class DeviceModels {
 			'Transformer Prime'							=> array( 'Asus', 'Eee Pad Transformer Prime', TYPE_TABLET ),
 			'(Transformer )?(Pad )?TF300(T|TG|TL)!'		=> array( 'Asus', 'Transformer Pad 300', TYPE_TABLET ),
 			'(Transformer )?(Pad )?TF700(T|K)!'			=> array( 'Asus', 'Transformer Pad Infinity 700', TYPE_TABLET ),
+			'Transformer Infinity'						=> array( 'Asus', 'Transformer Pad Infinity 700', TYPE_TABLET ),
+			'ME301T'									=> array( 'Asus', 'MemoPad ME301T', TYPE_TABLET ),
+			'ME371MG'									=> array( 'Asus', 'Fonepad K004', TYPE_TABLET ),
 			'PadFone'									=> array( 'Asus', 'Padfone', TYPE_TABLET ),
 			'PadFone 2'									=> array( 'Asus', 'Padfone 2', TYPE_TABLET ),
+			'PadFone Infinity'							=> array( 'Asus', 'Padfone Infinity', TYPE_TABLET ),
 			'OMS TTD'									=> array( 'Asus', 'Eee Pc T10' ),
 			'ASUS T20'									=> array( 'Asus', 'Eee Pc T20' ),
 			'ETBW11AA'									=> array( 'Asus', 'Tough' ),
+			'T-07B'										=> array( 'AudioSonic', 'T07B', TYPE_TABLET ),
 			'AUX V900'									=> array( 'AUX', 'V900' ),
+			'PICOpad GEW'								=> array( 'Axioo', 'Picopad GEW', TYPE_TABLET ),
+			'Axioo PICOpad GIM'							=> array( 'Axioo', 'Picopad GIM', TYPE_TABLET ),
+			'PICOpad GJT'								=> array( 'Axioo', 'Picopad GJT', TYPE_TABLET ),
 			'PICOpad-QGN'								=> array( 'Axioo', 'Picopad QGN', TYPE_TABLET ),
 			'A10 MID'									=> array( 'Azhuo', 'A10 MID', TYPE_TABLET ),
 			'NOOK'										=> array( 'Barnes & Noble', 'NOOK', TYPE_EREADER ),
@@ -294,17 +475,33 @@ class DeviceModels {
 			'(NOOK )?BNRV350!'							=> array( 'Barnes & Noble', 'NOOK Simple Touch', TYPE_EREADER ),
 			'(NOOK )?BNTV(400)!'						=> array( 'Barnes & Noble', 'NOOK HD Tablet', TYPE_EREADER ),
 			'(NOOK )?BNTV(600)!'						=> array( 'Barnes & Noble', 'NOOK HD+ Tablet', TYPE_EREADER ),
+			'Barnes & Noble Nook HD'					=> array( 'Barnes & Noble', 'NOOK HD Tablet', TYPE_EREADER ),
 			'Barnes & Noble Nook HD+'					=> array( 'Barnes & Noble', 'NOOK HD+ Tablet', TYPE_EREADER ),
 			'BenWee 5100'								=> array( 'BenWee', '5100' ),
 			'CA907AAC0G'								=> array( 'Besta', 'CA907AAC0G' ),
+			'BLU DASH 3.5'								=> array( 'BLU', 'Dash 3.5' ),
+			'BLU Quattro 4.5'							=> array( 'BLU', 'Quattro 4.5' ),
+			'BLU Quattro 4.5 HD'						=> array( 'BLU', 'Quattro 4.5 HD' ),
+			'BLU STUDIO 5.3 II'							=> array( 'BLU', 'Studio 5.3 II' ),
+			'BLU P100i'									=> array( 'BLU', 'Touch Book 7.0 Plus', TYPE_TABLET ),
 			'(BLU )?VIVO 4.3!'							=> array( 'BLU', 'Vivo 4.3' ),
+			'B3000'										=> array( 'BlueBo', 'B3000' ),
+			'JC-S9220'									=> array( 'Bmorn', 'Phone One' ),
 			'BM999'										=> array( 'Bmorn', 'BM999', TYPE_TABLET ),
 			'V11'										=> array( 'Bmorn', 'V11', TYPE_TABLET ),
 			'V99'										=> array( 'Bmorn', 'V99', TYPE_TABLET ),
+			'BOVO S-F16'								=> array( 'Bovo', 'Walker S-F16' ),
+			'S-F16'										=> array( 'Bovo', 'Walker S-F16' ),
 			'BROR W60'									=> array( 'BROR', 'W60' ),
+			'BROR W68'									=> array( 'BROR', 'W68' ),
 			'bq DaVinci'								=> array( 'bq', 'DaVinci', TYPE_TABLET ),
+			'bq Elcano'									=> array( 'bq', 'Elcano', TYPE_TABLET ),
+			'bq Edison'									=> array( 'bq', 'Edison', TYPE_TABLET ),
 			'Maxwell Lite'								=> array( 'bq', 'Maxwell Lite', TYPE_TABLET ),
+			'bq Maxwell Plus'							=> array( 'bq', 'Maxwell Plus', TYPE_TABLET ),
+			'bq Pascal 2'								=> array( 'bq', 'Pascal 2', TYPE_TABLET ),
 			'CT704'										=> array( 'Carrefour', 'CT704', TYPE_TABLET ),
+			'CT705'										=> array( 'Carrefour', 'CT705', TYPE_TABLET ),
 			'CT1002'									=> array( 'Carrefour', 'CT1002', TYPE_TABLET ),
 			'Camangi-Mangrove7'							=> array( 'Camangi', 'Mangrove 7', TYPE_TABLET ),
 			'WS171'										=> array( 'Camangi', 'WebStation', TYPE_TABLET ),
@@ -312,16 +509,27 @@ class DeviceModels {
 			'C771'										=> array( 'Casio', 'GzOne Commando' ),
 			'VX-100'									=> array( 'Casio', 'VX-100 EPOS Terminal', TYPE_POS ),
 			'CAT NOVA'									=> array( 'Cat', 'NOVA', TYPE_TABLET ),
+			'Celkon A 200'								=> array( 'Celkon', 'A200' ),
+			'Celkon CT7'								=> array( 'Celkon', 'CT7', TYPE_TABLET ),
 			'W820'										=> array( 'Cellon', 'HW-W820' ),
 			'ChangHong-Z-ME'							=> array( 'ChangHong', 'Z-me' ),
 			'Changhong H5018'							=> array( 'ChangHong', 'H5018' ),
+			'ChanghongW6'								=> array( 'ChangHong', 'W6' ),
+			'Titan TV S320'								=> array( 'Cherry Mobile', 'Titan TV S320' ),
+			'W900'										=> array( 'Cherry Mobile', 'W900' ),
+			'LA-M1'										=> array( 'Chili', 'M1' ),
+			'LA-Q1'										=> array( 'Chili', 'Q1' ),
 			'ARMM3V'									=> array( 'chinaleap', 'ARMM3V', TYPE_TABLET ),
 			'CIUS-7!'									=> array( 'Cisco', 'Cius', TYPE_TABLET ),
-			'CSL Spice MI300'							=> array( 'CSL', 'Spice MI300' ),
-			'CSL-MI410'									=> array( 'CSL', 'Spice MI410' ),
+			'Cloudfone Excite320e'						=> array( 'Cloudfone', 'Excite 320e' ),
+			'Thrill 430x'								=> array( 'Cloudfone', 'Thrill 430x' ),
+			'AQUILA 080-1008'							=> array( 'CMX', 'Aquila MID 080-1008', TYPE_TABLET ),
 			'MID1024'									=> array( 'Coby', 'Kyros MID1024', TYPE_TABLET ),
+			'MID1042'									=> array( 'Coby', 'Kyros MID1042', TYPE_TABLET ),
+			'MID1045'									=> array( 'Coby', 'Kyros MID1045', TYPE_TABLET ),
 			'MID1125'									=> array( 'Coby', 'Kyros MID1125', TYPE_TABLET ),
 			'MID1126'									=> array( 'Coby', 'Kyros MID1126', TYPE_TABLET ),
+			'MID7002'									=> array( 'Coby', 'Kyros MID7002', TYPE_TABLET ),
 			'MID7010'									=> array( 'Coby', 'Kyros MID7010', TYPE_TABLET ),
 			'MID7012'									=> array( 'Coby', 'Kyros MID7012', TYPE_TABLET ),
 			'MID7015!'									=> array( 'Coby', 'Kyros MID7015', TYPE_TABLET ),
@@ -330,12 +538,21 @@ class DeviceModels {
 			'MID7022'									=> array( 'Coby', 'Kyros MID7022', TYPE_TABLET ),
 			'MID7024'									=> array( 'Coby', 'Kyros MID7024', TYPE_TABLET ),
 			'MID7025'									=> array( 'Coby', 'Kyros MID7025', TYPE_TABLET ),
+			'MID7032'									=> array( 'Coby', 'Kyros MID7032', TYPE_TABLET ),
+			'MID7033'									=> array( 'Coby', 'Kyros MID7033', TYPE_TABLET ),
 			'MID7034'									=> array( 'Coby', 'Kyros MID7034', TYPE_TABLET ),
 			'MID7035'									=> array( 'Coby', 'Kyros MID7035', TYPE_TABLET ),
+			'MID7036'									=> array( 'Coby', 'Kyros MID7036', TYPE_TABLET ),
+			'MID7042'									=> array( 'Coby', 'Kyros MID7042', TYPE_TABLET ),
+			'MID7048'									=> array( 'Coby', 'Kyros MID7048', TYPE_TABLET ),
 			'MID7127'									=> array( 'Coby', 'Kyros MID7127', TYPE_TABLET ),
 			'MID8024'									=> array( 'Coby', 'Kyros MID8024', TYPE_TABLET ),
+			'MID8042'									=> array( 'Coby', 'Kyros MID8042', TYPE_TABLET ),
+			'MID8048'									=> array( 'Coby', 'Kyros MID8048', TYPE_TABLET ),
 			'MID8125'									=> array( 'Coby', 'Kyros MID8125', TYPE_TABLET ),
 			'MID8127'									=> array( 'Coby', 'Kyros MID8127', TYPE_TABLET ),
+			'MID9042'									=> array( 'Coby', 'Kyros MID9042', TYPE_TABLET ),
+			'MID9742'									=> array( 'Coby', 'Kyros MID9742', TYPE_TABLET ),
 			'Z71'										=> array( 'Commtiva', 'Z71' ),
 			'V-T100'									=> array( 'Commtiva', 'V-T100' ),
 			'FIH-FB0'									=> array( 'Commtiva', 'HD700'),
@@ -360,25 +577,43 @@ class DeviceModels {
 			'5855'										=> array( 'Coolpad', '5855' ),
 			'Coolpad 5860!'								=> array( 'Coolpad', '5860' ),
 			'5860'										=> array( 'Coolpad', '5860' ),
+			'5860A'										=> array( 'Coolpad', '5860A' ),
+			'5860S'										=> array( 'Coolpad', '5860S' ),
 			'Coolpad 5870'								=> array( 'Coolpad', '5870' ),
+			'5870'										=> array( 'Coolpad', '5870' ),
+			'Coolpad 5876'								=> array( 'Coolpad', '5876' ),
+			'Coolpad 5880'								=> array( 'Coolpad', '5880' ),
+			'Coolpad 5890'								=> array( 'Coolpad', '5890' ),
 			'Coolpad 7005'								=> array( 'Coolpad', '7005' ),
 			'Coolpad 7019!'								=> array( 'Coolpad', '7019' ),
-			'Coolpad 7230'								=> array( 'Coolpad', '7230' ),
+			'Coolpad 7020'								=> array( 'Coolpad', '7020' ),
+			'Coolpad 7230!'								=> array( 'Coolpad', '7230' ),
 			'7260'										=> array( 'Coolpad', '7260' ),
 			'Coolpad 7260!'								=> array( 'Coolpad', '7260' ),
 			'7266'										=> array( 'Coolpad', '7266' ),
+			'Coolpad 7290'								=> array( 'Coolpad', '7290' ),
+			'Coolpad 7295'								=> array( 'Coolpad', '7295' ),
+			'Coolpad 7728'								=> array( 'Coolpad', '7728' ),
+			'Coolpad 8010'								=> array( 'Coolpad', '8010' ),
 			'Coolpad 8013'								=> array( 'Coolpad', '8013' ),
+			'8022'										=> array( 'Coolpad', '8022' ),
 			'Coolpad 8026'								=> array( 'Coolpad', '8026' ),
+			'Coolpad 8028'								=> array( 'Coolpad', '8028' ),
+			'Coolpad 8050'								=> array( 'Coolpad', '8050' ),
+			'Coolpad -8190'								=> array( 'Coolpad', '8190' ),
 			'Coolpad 8809'								=> array( 'Coolpad', '8809' ),
 			'Coolpad 8810'								=> array( 'Coolpad', '8810' ),
 			'8810'										=> array( 'Coolpad', '8810' ),
 			'Coolpad 8811'								=> array( 'Coolpad', '8811' ),
+			'Coolpad 9070'								=> array( 'Coolpad', '9070' ),
 			'Coolpad 9120'								=> array( 'Coolpad', '9120' ),
 			'Coolpad 9900'								=> array( 'Coolpad', '9900' ),
 			'Coolpad 9960'								=> array( 'Coolpad', '9960' ),
+			'CMP741E'									=> array( 'Craig', 'CMP741e', TYPE_TABLET ),
 			'ZiiO7'										=> array( 'Creative', 'ZiiO 7', TYPE_TABLET ),
 			'ZiiLABS ZiiO7'								=> array( 'Creative', 'ZiiO 7', TYPE_TABLET ),
 			'ZiiLABS ZiiO10 '							=> array( 'Creative', 'ZiiO 10', TYPE_TABLET ),
+			'CTP828BT'									=> array( 'Cresta', 'CTP828BT', TYPE_TABLET ),
 			'CUBE K8GT A'								=> array( 'Cube', 'K8GT A', TYPE_TABLET ),
 			'CUBE K8GT B'								=> array( 'Cube', 'K8GT B', TYPE_TABLET ),
 			'K8GT C'									=> array( 'Cube', 'K8GT C', TYPE_TABLET ),
@@ -387,26 +622,39 @@ class DeviceModels {
 			'K8GT W'									=> array( 'Cube', 'K8GT W', TYPE_TABLET ),
 			'CUBE U8GT'									=> array( 'Cube', 'U8GT', TYPE_TABLET ),
 			'CUBE U9GT'									=> array( 'Cube', 'U9GT', TYPE_TABLET ),
-			'CUBE U9GT ?2!'								=> array( 'Cube', 'U9GT 2', TYPE_TABLET ),
 			'U9GT'										=> array( 'Cube', 'U9GT', TYPE_TABLET ),
-			'U9GT2!'									=> array( 'Cube', 'U9GT 2', TYPE_TABLET ),
-			'N90 From moage.com'						=> array( 'Cube', 'U9GT 2', TYPE_TABLET ),
-			'U9GT3'										=> array( 'Cube', 'U9GT 3', TYPE_TABLET ),
 			'U9GT S'									=> array( 'Cube', 'U9GT S', TYPE_TABLET ),
 			'U9GT S A'									=> array( 'Cube', 'U9GT SA', TYPE_TABLET ),
 			'U9GTS A'									=> array( 'Cube', 'U9GT SA', TYPE_TABLET ),
-			'U10GT 2'									=> array( 'Cube', 'U10GT 2', TYPE_TABLET ),
+			'U9GT V'									=> array( 'Cube', 'U9GT V', TYPE_TABLET ),
+			'CUBE U9GT ?2!'								=> array( 'Cube', 'U9GT2', TYPE_TABLET ),
+			'U9GT2!'									=> array( 'Cube', 'U9GT2', TYPE_TABLET ),
+			'N90 From moage.com'						=> array( 'Cube', 'U9GT2', TYPE_TABLET ),
+			'U9GT3'										=> array( 'Cube', 'U9GT3', TYPE_TABLET ),
+			'U9GT3-S'									=> array( 'Cube', 'U9GT3 S', TYPE_TABLET ),
+			'U9GT4'										=> array( 'Cube', 'U9GT4', TYPE_TABLET ),
 			'U10GT S'									=> array( 'Cube', 'U10GT S', TYPE_TABLET ),
+			'U10GT 2'									=> array( 'Cube', 'U10GT2', TYPE_TABLET ),
 			'CUBE U15GT'								=> array( 'Cube', 'U15GT', TYPE_TABLET ),
-			'U18GT2'									=> array( 'Cube', 'U18GT 2', TYPE_TABLET ),
+			'U18GT-H'									=> array( 'Cube', 'U18GT H', TYPE_TABLET ),
+			'U18GT-W'									=> array( 'Cube', 'U18GT W', TYPE_TABLET ),
+			'U18GT2'									=> array( 'Cube', 'U18GT2', TYPE_TABLET ),
+			'U19GT-W'									=> array( 'Cube', 'U19GT W', TYPE_TABLET ),
+			'U20GT'										=> array( 'Cube', 'U20GT', TYPE_TABLET ),
 			'U23GT'										=> array( 'Cube', 'U23GT', TYPE_TABLET ),
+			'U25GT'										=> array( 'Cube', 'U25GT', TYPE_TABLET ),
 			'U30GT-H'									=> array( 'Cube', 'U30GT H', TYPE_TABLET ),
 			'U30GT-M'									=> array( 'Cube', 'U30GT M', TYPE_TABLET ),
 			'U30GT MINI'								=> array( 'Cube', 'U30GT Mini', TYPE_TABLET ),
+			'U30GT-mini'								=> array( 'Cube', 'U30GT Mini', TYPE_TABLET ),
 			'CUBE Q7PRO'								=> array( 'Cube', 'Q7 Pro', TYPE_TABLET ),
 			'CUBE Q7PRO J'								=> array( 'Cube', 'Q7 Pro', TYPE_TABLET ),
+			'LT8088'									=> array( 'Curtis', 'Klu LT8088', TYPE_TABLET ),
 			'Cydle M7!'									=> array( 'Cydle', 'M7 MultiPAD', TYPE_TABLET ),
+			'DAKELE MC001'								=> array( 'Dakele', 'MC001' ),
+			'EVOPad R9720'								=> array( 'Dark', 'EvoPad R9720', TYPE_TABLET ),
 			'HB-100 DASAN'								=> array( 'Dasan', 'HB-100', TYPE_TELEVISION ),
+			'HB-100 DASAN Networks, Inc.'				=> array( 'Dasan', 'HB-100', TYPE_TELEVISION ),
 			'Dell Aero'									=> array( 'Dell', 'Aero' ),
 			'Dell M01M'									=> array( 'Dell', 'Mini 5', TYPE_TABLET ),
 			'Dell Streak'								=> array( 'Dell', 'Streak', TYPE_TABLET ),
@@ -422,42 +670,70 @@ class DeviceModels {
 			'Dell XCD35'								=> array( 'Dell', 'XCD35' ),
 			'XCD35'										=> array( 'Dell', 'XCD35' ),
 			'deovo V5'									=> array( 'deovo', 'V5' ),
+			'Digma iDj7'								=> array( 'Digma', 'iDj7', TYPE_TABLET ),
 			'iDx7'										=> array( 'Digma', 'iDx7', TYPE_TABLET ),
+			'iDxD7 3G'									=> array( 'Digma', 'iDxD7', TYPE_TABLET ),
 			'iDx10!'									=> array( 'Digma', 'iDx10', TYPE_TABLET ),
+			'DISTAB9000R'								=> array( 'Disgo', 'Distab 9000R', TYPE_TABLET ),
 			'DM009SH'									=> array( 'Disney Mobile', 'DM009SH' ),
 			'DM010SH'									=> array( 'Disney Mobile', 'DM010SH' ),
 			'DM012SH'									=> array( 'Disney Mobile', 'DM012SH' ),
 			'F-08D'										=> array( 'Disney Mobile', 'F-08D' ),
 			'P-05D'										=> array( 'Disney Mobile', 'P-05D' ),
+			'DJC Touchtab3'								=> array( 'DJC', 'Touchtab3', TYPE_TABLET ),
+			'DPS Dream 9'								=> array( 'DPS', 'Dream 9', TYPE_TABLET ),
 			'domod G20'									=> array( 'Domod', 'G20' ),
+			'M975'										=> array( 'Double Power', 'M975', TYPE_TABLET ),
 			'TD-1010'									=> array( 'Double Power', 'TD-1010', TYPE_TABLET ),
 			'Tablet-P27'								=> array( 'DracoTek', 'P27 Tablet', TYPE_TABLET ),
 			'ACM3066-8'									=> array( 'MY|eebo', 'Color Tablet', TYPE_TABLET ),
+			'SUPREME IPS Dual Core X200'				=> array( 'E-Boda', 'Supreme IPS Dual Core X200', TYPE_TABLET ),
+			'EBEST W16A'								=> array( 'EBEST', 'W16A' ),
+			'D709'										=> array( 'Empire Electronix', 'Tablet D709', TYPE_TABLET ),
 			'edgejr'									=> array( 'EnTourage', 'Pocket eDGe', TYPE_TABLET ),
 			'l97D'										=> array( 'EPad', 'l97D', TYPE_TABLET ),
 			'epade A360S'								=> array( 'epade', 'A360S' ),
 			'M4301'										=> array( 'Eston', 'MID M4301', 'media' ),
 			'P10AN'										=> array( 'Exper', 'Easypad P10AN', TYPE_TABLET ),
 			'Informer-702'								=> array( 'Explay', 'Informer 702', TYPE_TABLET ),
+			'informer 921'								=> array( 'Explay', 'Informer 921', TYPE_TABLET ),
 			'FIH-F0X'									=> array( 'FIH', 'F0X' ),
+			'Fly F350'									=> array( 'Fly', 'F350' ),
+			'Fly IQ237'									=> array( 'Fly', 'IQ237' ),
 			'Fly IQ245'									=> array( 'Fly', 'IQ245 Wizard' ),
+			'Fly IQ245 Plus'							=> array( 'Fly', 'IQ245 Wizard Plus' ),
+			'IQ255'										=> array( 'Fly', 'IQ255 Pride' ),
+			'FLY IQ256'									=> array( 'Fly', 'IQ256 Vogue' ),
 			'Fly IQ260'									=> array( 'Fly', 'IQ260 BlackBird' ),
-			'Fly IQ285'									=> array( 'Fly', 'IQ285 Turbo' ),
+			'Fly IQ285!'								=> array( 'Fly', 'IQ285 Turbo' ),
+			'Fly IQ430'									=> array( 'Fly', 'IQ430 Evoke' ),
 			'(Fly )?IQ440!'								=> array( 'Fly', 'IQ440 Energie' ),
 			'(Fly )?IQ441!'								=> array( 'Fly', 'IQ441 Radiance' ),
 			'Fly IQ442'									=> array( 'Fly', 'IQ442 Miracle' ),
+			'Fly IQ444'									=> array( 'Fly', 'IQ444 Diamond' ),
+			'Fly IQ446'									=> array( 'Fly', 'IQ446 Magic' ),
+			'Fly IQ450'									=> array( 'Fly', 'IQ450 Horizon' ),
+			'BC1003'									=> array( 'Flytouch', 'BC1003', TYPE_TABLET ),
 			'NABI2-NV7A'								=> array( 'Fuhu', 'NABI', TYPE_TABLET ),
 			'ISW11F'									=> array( 'Fujitsu', 'Arrows Z' ),
 			'ISW13F'									=> array( 'Fujitsu', 'Arrows Z' ),
 			'IS12F'										=> array( 'Fujitsu', 'Arrows ES' ),
 			'F-01D'										=> array( 'Fujitsu', 'Arrows Tab LTE', TYPE_TABLET ),
+			'F-02E'										=> array( 'Fujitsu', 'Arrows X' ),
 			'F-03D'										=> array( 'Fujitsu', 'Arrows Kiss' ),
+			'F-03E'										=> array( 'Fujitsu', 'Arrows Kiss' ),
+			'F-04E'										=> array( 'Fujitsu', 'Arrows V' ),
 			'F-05D'										=> array( 'Fujitsu', 'Arrows X LTE' ),
+			'F-05E'										=> array( 'Fujitsu', 'Arrows Tab' ),
 			'F-07D'										=> array( 'Fujitsu', 'Arrows μ' ),
+			'F-09D'										=> array( 'Fujitsu', 'ANTEPRIMA' ),
 			'F-10D'										=> array( 'Fujitsu', 'Arrows X F-10D' ),
 			'F-11D'										=> array( 'Fujitsu', 'Arrows Me' ),
 			'F-12C'										=> array( 'Fujitsu', 'Globetrotter' ),
+			'F-12D'										=> array( 'Fujitsu', 'F-12D' ),
 			'f12arc'									=> array( 'Fujitsu', 'F12arc' ),
+			'f12bob'									=> array( 'Fujitsu', 'F12bob' ),
+			'FJL21'										=> array( 'Fujitsu', 'Arrows ef FJL21' ),
 			'M532'										=> array( 'Fujitsu', 'Stylistic M532', TYPE_TABLET ),
 			'Garminfone'								=> array( 'Garmin-Asus', 'Garminfone' ),
 			'Garmin-Asus A10'							=> array( 'Garmin-Asus', 'Nuvifone A10' ),
@@ -468,16 +744,20 @@ class DeviceModels {
 			'Gemei G3'									=> array( 'Gemei', 'G3', TYPE_TABLET ),
 			'Gemei G9'									=> array( 'Gemei', 'G9', TYPE_TABLET ),
 			'GEM7008'									=> array( 'Gemini', 'JoyTab GEM7008', TYPE_TABLET ),
+			'GSmart G1310'								=> array( 'Gigabyte', 'GSmart G1310' ),
 			'GSmart G1317D'								=> array( 'Gigabyte', 'GSmart G1317D' ),
 			'GSmart G1342'								=> array( 'Gigabyte', 'GSmart G1342' ),
 			'GSmart G1345'								=> array( 'Gigabyte', 'GSmart G1345' ),
 			'GSmart G1362'								=> array( 'Gigabyte', 'GSmart G1362' ),
+			'GSmart GS202!'								=> array( 'Gigabyte', 'GSmart GS202' ),
 			'Gigabyte TB100'							=> array( 'Gigabyte', 'TB100', TYPE_TABLET ),
 			'GIO-GiONEE C500'							=> array( 'Gionee', 'C500' ),
 			'GIO-GiONEE C600'							=> array( 'Gionee', 'C600' ),
 			'GN100'										=> array( 'Gionee', 'GN100' ),		
 			'GN105'										=> array( 'Gionee', 'GN105' ),		
+			'GN106'										=> array( 'Gionee', 'GN106' ),		
 			'GN109'										=> array( 'Gionee', 'GN109' ),
+			'GN135'										=> array( 'Gionee', 'GN135' ),
 			'GN180'										=> array( 'Gionee', 'GN180' ),
 			'GN200'										=> array( 'Gionee', 'GN200' ),		
 			'GN205'										=> array( 'Gionee', 'GN205' ),
@@ -485,18 +765,41 @@ class DeviceModels {
 			'GN360'										=> array( 'Gionee', 'GN360' ),
 			'GN700T'									=> array( 'Gionee', 'GN700T' ),
 			'GN700W'									=> array( 'Gionee', 'GN700W' ),
+			'GN708W'									=> array( 'Gionee', 'GN708W' ),
+			'GN800'										=> array( 'Gionee', 'GN800' ),
+			'GN818T'									=> array( 'Gionee', 'GN818T' ),
 			'GN858'										=> array( 'Gionee', 'GN858' ),
+			'GN868'										=> array( 'Gionee', 'GN86N7078' ),
+			'GOCLEVER'									=> array( 'Goclever', 'TAB', TYPE_TABLET ),
+			'GOCLEVER TAB A73'							=> array( 'Goclever', 'TAB A73', TYPE_TABLET ),
+			'GOCLEVER TAB A93'							=> array( 'Goclever', 'TAB A93', TYPE_TABLET ),
 			'GOCLEVER TAB A103'							=> array( 'Goclever', 'TAB A103', TYPE_TABLET ),
 			'GOCLEVER TAB A104'							=> array( 'Goclever', 'TAB A104', TYPE_TABLET ),
+			'GOCLEVER TAB M703G'						=> array( 'Goclever', 'TAB M703G', TYPE_TABLET ),
+			'GOCLEVER TAB R106'							=> array( 'Goclever', 'TAB R106', TYPE_TABLET ),
+			'GOCLEVER TAB T76'							=> array( 'Goclever', 'TAB T76', TYPE_TABLET ),
+			'GOCLEVER TAB 9300'							=> array( 'Goclever', 'TAB 9300', TYPE_TABLET ),
+			'M758A'										=> array( 'Gpad', 'M758A', TYPE_TABLET ),
+			'GO M3'										=> array( 'GreenOrange', 'M3' ),
+			'HE-E760'									=> array( 'Haier', 'HE-E760' ),
 			'Haier-HT-I617'								=> array( 'Haier', 'HT-I617' ),
+			'HT-I617'									=> array( 'Haier', 'HT-I617' ),
 			'Haier HW-W910'								=> array( 'Haier', 'HW-W910' ),
 			'W718'										=> array( 'Haier', 'W718' ),
 			'I9220'										=> array( 'Haipai', 'I9220' ),
+			'X710d'										=> array( 'Haipai', 'X710D' ),
 			'X720D'										=> array( 'Haipai', 'X720D' ),
 			'SN10T1'									=> array( 'HANNspree', 'HANNSpad SN10T1', TYPE_TABLET ),
 			'SN10T2'									=> array( 'HANNspree', 'HANNSpad SN10T2', TYPE_TABLET ),
 			'HannsComb'									=> array( 'HANNspree', 'HANNSpad', TYPE_TABLET ),
+			'Hannspadd'									=> array( 'HANNspree', 'HANNSpad', TYPE_TABLET ),
+			'MITO A300'									=> array( 'Harga', 'MITO A300' ),
 			'X1'										=> array( 'HCL', 'ME X1', TYPE_TABLET ),
+			'Y2'										=> array( 'HCL', 'ME Y2', TYPE_TABLET ),
+			'H701'										=> array( 'Hedy', 'H701' ),
+			'9300+'										=> array( 'Hero', '9300+' ),
+			'H2000+'									=> array( 'Hero', 'H2000+' ),
+			'H9500'										=> array( 'Hero', 'H9500' ),
 			'MID Ser(ai|ia)ls!'							=> array( 'Herotab', 'C8', TYPE_TABLET ),
 			'HILIVE H7'									=> array( 'Hilive', 'H7' ),
 			'HS-7DTB6-4GB'								=> array( 'Hipstreet', '7" Aurora tablet', TYPE_TABLET ),
@@ -504,18 +807,25 @@ class DeviceModels {
 			'COSMO DUO'									=> array( 'Hiscreen', 'Cosmo DUO', TYPE_TABLET ),
 			'HS-U8'										=> array( 'Hisense', 'U8' ),
 			'HS-U950'									=> array( 'Hisense', 'U950' ),
+			'HS-U960Q'									=> array( 'Hisense', 'U960' ),
 			'HS-T92'									=> array( 'Hisense', 'T92' ),
 			'T92'										=> array( 'Hisense', 'T92' ),
+			'Hisense T92'								=> array( 'Hisense', 'T92' ),
 			'HS-T96'									=> array( 'Hisense', 'T96' ),
 			'HS-T909'									=> array( 'Hisense', 'T909' ),
+			'HS-T930'									=> array( 'Hisense', 'T930' ),
+			'HS-E830'									=> array( 'Hisense', 'E830' ),
 			'HS-E860'									=> array( 'Hisense', 'E860' ),
 			'E860'										=> array( 'Hisense', 'E860' ),
 			'HS-E910'									=> array( 'Hisense', 'E910' ),
 			'HS-E920'									=> array( 'Hisense', 'E920' ),
 			'HS-E926'									=> array( 'Hisense', 'E926' ),
+			'HS-E956Q'									=> array( 'Hisense', 'E956' ),
 			'HS-EG900'									=> array( 'Hisense', 'EG900' ),
 			'HS-EG906'									=> array( 'Hisense', 'EG906' ),
+			'HS-EG909'									=> array( 'Hisense', 'EG909' ),
 			'AD683G'									=> array( 'Hisense', 'EG909' ),
+			'HS-EG950'									=> array( 'Hisense', 'EG950' ),
 			'HS-ET919'									=> array( 'Hisense', 'ET919' ),
 			'EG968B'									=> array( 'Hisense', 'EG968B' ),
 			'HKPHONE H8-3G'								=> array( 'HKPhone', 'H8 3G' ),
@@ -532,6 +842,8 @@ class DeviceModels {
 			'HTC A810e'									=> array( 'HTC', 'ChaCha' ),
 			'HTC A9188!'								=> array( 'HTC', 'Cullinan' ),
 			'HTC Desire C'								=> array( 'HTC', 'Desire C' ),
+			'HTC H1000C'								=> array( 'HTC', 'Desire C' ),
+			'HTC A320e'									=> array( 'HTC', 'Desire C' ),
 			'HTC Desire ?HD!'							=> array( 'HTC', 'Desire HD' ),
 			'HTC A91(91|92)!'							=> array( 'HTC', 'Desire HD' ),
 			'HTC ?Desire ?S( |$)!'						=> array( 'HTC', 'Desire S' ),
@@ -544,6 +856,8 @@ class DeviceModels {
 			'HTC T328d'									=> array( 'HTC', 'Desire VC' ),
 			'HTC Desire VT'								=> array( 'HTC', 'Desire VT' ),
 			'HTC T328t'									=> array( 'HTC', 'Desire VT' ),
+			'HTC Desire ?X!'							=> array( 'HTC', 'Desire X' ),
+			'HTC T329w'									=> array( 'HTC', 'Desire X' ),
 			'HTC Desire ?Z!'							=> array( 'HTC', 'Desire Z' ),
 			'HTC Vision'								=> array( 'HTC', 'Desire Z' ),
 			'HTC A72(71|72|75)!'						=> array( 'HTC', 'Desire Z' ),
@@ -552,19 +866,21 @@ class DeviceModels {
 			'HTC A81(81|83)!'							=> array( 'HTC', 'Desire' ),
 			'HTC ?X06HT!'								=> array( 'HTC', 'Desire' ),
 			'HTC Dream'									=> array( 'HTC', 'Dream' ),
+			'HTC Droid DNA'								=> array( 'HTC', 'Droid DNA' ),
 			'HTC Droid Incredible'						=> array( 'HTC', 'Droid Incredible' ),
 			'HTC S710d'									=> array( 'HTC', 'Droid Incredible 2' ),
 			'HTC Incredible 2'							=> array( 'HTC', 'Droid Incredible 2' ),
-			'HTC EVO ?3D!'								=> array( 'HTC', 'EVO 3D' ),
+			'HTC ?EVO ?3D!'								=> array( 'HTC', 'EVO 3D' ),
 			'HTC X51(5a|5c|5d|5m)!'						=> array( 'HTC', 'EVO 3D' ),
 			'HTC EVO 4G\+!'								=> array( 'HTC', 'EVO 4G+' ),
 			'HTC X515e'									=> array( 'HTC', 'EVO 4G+' ),
 			'HTC ?EVO ?4G!'								=> array( 'HTC', 'EVO 4G' ),
 			'HTC jewel'									=> array( 'HTC', 'EVO 4G' ),
+			'HTC ?EVO ?V ?4G!'							=> array( 'HTC', 'EVO V 4G' ),
 			'HTC ?(EVO ?)?Design ?4G!'					=> array( 'HTC', 'EVO Design 4G' ),		
 			'HTC C715c'									=> array( 'HTC', 'EVO Design 4G' ),
 			'HTC EVO Shift!'							=> array( 'HTC', 'EVO Shift' ),
-			'HTC Explorer!'								=> array( 'HTC', 'Explorer' ),
+			'HTC ?Explorer!'							=> array( 'HTC', 'Explorer' ),
 			'HTC A31(0b|0e)!'							=> array( 'HTC', 'Explorer' ),
 			'HTC Flyer!'								=> array( 'HTC', 'Flyer', TYPE_TABLET ),
 			'HTC P51(0e|2|5e)!'							=> array( 'HTC', 'Flyer', TYPE_TABLET ),
@@ -584,8 +900,9 @@ class DeviceModels {
 			'HTC H3000C'								=> array( 'HTC', 'Hero' ),
 			'HTC IMAGIO'								=> array( 'HTC', 'Imagio' ),
 			'HTC Incredible'							=> array( 'HTC', 'Incredible' ),
+			'HTC Incredible CDMA'						=> array( 'HTC', 'Incredible' ),
 			'HTC Incredible ?S!'						=> array( 'HTC', 'Incredible S' ),
-			'HTC Vivo'									=> array( 'HTC', 'Incredible S' ),
+			'HTC ?Vivo!'								=> array( 'HTC', 'Incredible S' ),
 			'HTC S710e!'								=> array( 'HTC', 'Incredible S' ),
 			'HTC Innovation'							=> array( 'HTC', 'Innovation' ),
 			'HTC (HD7 )?Inspire!'						=> array( 'HTC', 'Inspire 4G' ),
@@ -593,28 +910,41 @@ class DeviceModels {
 			'HTC X920e'									=> array( 'HTC', 'J Butterfly' ),
 			'HTC Butterfly'								=> array( 'HTC', 'J Butterfly' ),
 			'HTC P715a'									=> array( 'HTC', 'Jetstream', TYPE_TABLET ),
+			'HTC PG09410'								=> array( 'HTC', 'Jetstream', TYPE_TABLET ),
 			'HTC Legend'								=> array( 'HTC', 'Legend' ),
 			'HTC Magic!'								=> array( 'HTC', 'Magic' ),
 			'HTC Sapphire'								=> array( 'HTC', 'Magic' ),
+			'HTC Merge'									=> array( 'HTC', 'Merge' ),
 			'HTC Lexikon'								=> array( 'HTC', 'Merge' ),
 			'HTC One S'									=> array( 'HTC', 'One S' ),
 			'HTC One S !'								=> array( 'HTC', 'One S' ),
 			'HTC Z(52|56)0e!'							=> array( 'HTC', 'One S' ),
 			'HTC T528d'									=> array( 'HTC', 'One SC' ),
+			'HTC T528t'									=> array( 'HTC', 'One ST' ),
 			'HTC T528w'									=> array( 'HTC', 'One SU' ),
-			'HTC One SV'								=> array( 'HTC', 'One SV' ),
+			'HTC One ?SV!'								=> array( 'HTC', 'One SV' ),
+			'HTC C525c'									=> array( 'HTC', 'One SV' ),
+			'HTC C525u'									=> array( 'HTC', 'One SV' ),
 			'HTC One V'									=> array( 'HTC', 'One V' ),
+			'HTC T120C'									=> array( 'HTC', 'One V' ),
 			'HTC T320e'									=> array( 'HTC', 'One V' ),
 			'HTC H2000C'								=> array( 'HTC', 'One V' ),
 			'HTC One VX'								=> array( 'HTC', 'One VX' ),
 			'HTC One X'									=> array( 'HTC', 'One X' ),
 			'HTC Endeavour!'							=> array( 'HTC', 'One X' ),
 			'HTC S720e'									=> array( 'HTC', 'One X' ),
+			'HTC One X S720e'							=> array( 'HTC', 'One X' ),
+			'HTC One X with Beats Audio'				=> array( 'HTC', 'One X' ),
 			'HTC One X+'								=> array( 'HTC', 'One X+' ),
 			'HTC OneXplus'								=> array( 'HTC', 'One X+' ),
 			'HTC PM63100'								=> array( 'HTC', 'One X+' ),
+			'HTC X720d'									=> array( 'HTC', 'One XC' ),
 			'HTC One XL'								=> array( 'HTC', 'One XL' ),
 			'HTC S720t'									=> array( 'HTC', 'One XT' ),
+			'HTC PN071'									=> array( 'HTC', 'One' ),
+			'HTC PN072'									=> array( 'HTC', 'One' ),
+			'HTC One 801e'								=> array( 'HTC', 'One' ),
+			'HTC One'									=> array( 'HTC', 'One' ),
 			'HTC Raider!'								=> array( 'HTC', 'Raider 4G' ),
 			'HTC Holiday'								=> array( 'HTC', 'Raider 4G' ),
 			'HTC X710(a|e|s)!'							=> array( 'HTC', 'Raider 4G' ),
@@ -642,6 +972,7 @@ class DeviceModels {
 			'HTC A3288'									=> array( 'HTC', 'Tattoo' ),
 			'HTC A9188'									=> array( 'HTC', 'Tianxi' ),
 			'HTC X310e'									=> array( 'HTC', 'Titan' ),
+			'HTC Polaris'								=> array( 'HTC', 'Touch Cruise' ),
 			'HTC DiamondII EX'							=> array( 'HTC', 'Touch Diamond II' ),
 			'HTC T7373'									=> array( 'HTC', 'Touch Pro II' ),
 			'HTC ThunderBolt( 4G)?!'					=> array( 'HTC', 'ThunderBolt'),	
@@ -649,21 +980,25 @@ class DeviceModels {
 			'HTC Velocity!'								=> array( 'HTC', 'Velocity 4G'),
 			'HTC ?Wildfire ?S!'							=> array( 'HTC', 'Wildfire S' ),	
 			'HTC .*A510(a|b|c|e)!'						=> array( 'HTC', 'Wildfire S' ),
+			'HTC ?PG762!'								=> array( 'HTC', 'Wildfire S' ),
 			'HTC Wildfire!'								=> array( 'HTC', 'Wildfire' ),
 			'HTC .*A33(33|66|80)!'						=> array( 'HTC', 'Wildfire' ),
 			'HTC A6390'									=> array( 'HTC', 'A6390' ),
 			'HTC A8180'									=> array( 'HTC', 'A8180' ),
-			'HTC PG762'									=> array( 'HTC', 'PG762' ),
 			'HTC S610d'									=> array( 'HTC', 'S610d' ),
 			'HTC S715e'									=> array( 'HTC', 'S715e' ),
 			'HTC T329t'									=> array( 'HTC', 'T329t' ),
 			'HTC Z510d'									=> array( 'HTC', 'Z510d' ),
+			'HTC GOF U'									=> array( 'HTC', 'Desire C' ),
 			'HTC VLE U'									=> array( 'HTC', 'One S' ),
 			'HTC VLE#U'									=> array( 'HTC', 'One S' ),
 			'HTC VIE U'									=> array( 'HTC', 'One S' ),
+			'HTC K2 UL'									=> array( 'HTC', 'One SV' ),
 			'HTC EVA UL'								=> array( 'HTC', 'One V' ),
-			'HTC DLX U'									=> array( 'HTC', 'Droid DNA' ),
+//			'HTC IMN WLJ'								
+			'HTC DLX WLJ'								=> array( 'HTC', 'J Butterfly' ),
 			'HTC DLX WL'								=> array( 'HTC', 'Droid DNA' ),
+			'HTC DLX U'									=> array( 'HTC', 'Droid DNA' ),
 			'HTC6435LVW!'								=> array( 'HTC', 'Droid DNA' ),
 			'DLX'										=> array( 'HTC', 'Droid DNA' ),
 			'HTC ENR U'									=> array( 'HTC', 'One X' ),
@@ -686,6 +1021,7 @@ class DeviceModels {
 			'Evo HD2'									=> array( 'HTC', 'EVO HD' ),
 			'EVO ?3D!'									=> array( 'HTC', 'EVO 3D' ),
 			'EVO 4G'									=> array( 'HTC', 'EVO 4G' ),
+			'Evo V 4G'									=> array( 'HTC', 'EVO V 4G' ),
 			'photon'									=> array( 'HTC', 'HD mini' ),
 			'HD2'										=> array( 'HTC', 'HD2' ),
 			'NexusHD2'									=> array( 'HTC', 'HD2' ),
@@ -700,6 +1036,7 @@ class DeviceModels {
 			'Inspire 4G'								=> array( 'HTC', 'Inspire 4G' ),
 			'Legend'									=> array( 'HTC', 'Legend' ),
 			'Docomo HT-03A'								=> array( 'HTC', 'Magic' ),
+			'One S'										=> array( 'HTC', 'One S' ),
 			'One X'										=> array( 'HTC', 'One X' ),
 			'One V'										=> array( 'HTC', 'One V' ),
 			'Rezound'									=> array( 'HTC', 'Rezound' ),
@@ -710,12 +1047,14 @@ class DeviceModels {
 			'Pyramid'									=> array( 'HTC', 'Sensation' ),
 			'TripNiCE Pyramid'							=> array( 'HTC', 'Sensation' ),
 			'Click'										=> array( 'HTC', 'Tattoo' ),
+			'Vivid 4G'									=> array( 'HTC', 'Vivid 4G' ),
 			'Wildfire S!'								=> array( 'HTC', 'Wildfire S' ),
 			'Wildfire!'									=> array( 'HTC', 'Wildfire' ),
 			'Sprint APX515CKT'							=> array( 'HTC', 'EVO 3D' ),
 			'Sprint APA9292KT'							=> array( 'HTC', 'EVO 4G' ),
 			'Sprint APA7373KT'							=> array( 'HTC', 'EVO Shift 4G' ),
 			'Sprint APC715CKT'							=> array( 'HTC', 'EVO Design 4G' ),
+			'A320a'										=> array( 'HTC', 'Desire C' ),					
 			'A3380'										=> array( 'HTC', 'Wildfire' ),
 			'A6277'										=> array( 'HTC', 'Hero' ),
 			'a7272'										=> array( 'HTC', 'Desire Z' ),					
@@ -723,15 +1062,18 @@ class DeviceModels {
 			'S31HT'										=> array( 'HTC', 'Aria' ),
 			'S710d'										=> array( 'HTC', 'Droid Incredible 2' ),
 			'S710D'										=> array( 'HTC', 'Droid Incredible 2' ),
+			'T320a'										=> array( 'HTC', 'One V' ),
 			'X06HT'										=> array( 'HTC', 'Desire' ),
 			'001HT'										=> array( 'HTC', 'Desire HD' ),
 			'X325a'										=> array( 'HTC', 'One X' ),
 			'X525a'										=> array( 'HTC', 'One X+' ),
+			'X710E'										=> array( 'HTC', 'Raider 4G' ),
 			'Z520m'										=> array( 'HTC', 'One S' ),
 			'Z710'										=> array( 'HTC', 'Sensation' ),
 			'Z710e'										=> array( 'HTC', 'Sensation' ),
 			'T9199h'									=> array( 'HTC', 'T9199h' ),
 			'ADR6200'									=> array( 'HTC', 'Droid Eris' ),
+			'HTCADR6290US'								=> array( 'HTC', 'One V' ),
 			'ADR6300'									=> array( 'HTC', 'Droid Incredible' ),
 			'ADR6325!'									=> array( 'HTC', 'Merge' ),
 			'ADR6330VW'									=> array( 'HTC', 'Rhyme' ),	
@@ -742,7 +1084,7 @@ class DeviceModels {
 			'Coquettish Red'							=> array( 'HTC', 'Rezound' ),
 			'PB99400'									=> array( 'HTC', 'Desire' ),	
 			'pcdadr6350'								=> array( 'HTC', 'Droid Incredible 2' ),
-			'PC36100'									=> array( 'HTC', 'EVO 4G' ),
+			'PC36100!'									=> array( 'HTC', 'EVO 4G' ),
 			'PG06100'									=> array( 'HTC', 'EVO Shift 4G' ),
 			'PG41200'									=> array( 'HTC', 'EVO View 4G', TYPE_TABLET ),
 			'PG86100!'									=> array( 'HTC', 'EVO 3D' ),
@@ -754,6 +1096,7 @@ class DeviceModels {
 			'ISW12HT'									=> array( 'HTC', 'EVO 3D' ),
 			'ISW13HT'									=> array( 'HTC', 'J' ),
 			'HTL21'										=> array( 'HTC', 'J Butterfly' ),
+			'HTX21'										=> array( 'HTC', 'au Infobar A02' ),
 			'USCCADR6275US!'							=> array( 'HTC', 'Desire' ),
 			'USCCADR6285US!'							=> array( 'HTC', 'Hero S' ),
 			'USCCADR6325US!'							=> array( 'HTC', 'Merge' ),
@@ -762,21 +1105,29 @@ class DeviceModels {
 			'Huawei S7-312u'							=> array( 'Huawei', 'MediaPad', TYPE_TABLET ),
 			'MediaPad 7 Lite'							=> array( 'Huawei', 'MediaPad 7 Lite', TYPE_TABLET ),
 			'MediaPad 10 FHD'							=> array( 'Huawei', 'MediaPad 10', TYPE_TABLET ),
+			'Huawei A199'								=> array( 'Huawei', 'A199' ),
 			'Huawei C8500!'								=> array( 'Huawei', 'C8500' ),
 			'Huawei C8600'								=> array( 'Huawei', 'C8600' ),
 			'Huawei C8650!'								=> array( 'Huawei', 'C8650' ),
+			'Huawei C8655'								=> array( 'Huawei', 'Ascend Y201C' ),
 			'Huawei C8800'								=> array( 'Huawei', 'IDEOS X5' ),
 			'Huawei C8810'								=> array( 'Huawei', 'Ascend G300' ),
 			'Huawei C8812!'								=> array( 'Huawei', 'Ascend C8812' ),
+			'Huawei C8813!'								=> array( 'Huawei', 'Ascend C8813' ),
 			'Huawei C8825D'								=> array( 'Huawei', 'Ascend G330C' ),
+			'Huawei C8826D'								=> array( 'Huawei', 'Ascend G500C' ),
 			'Huawei C8860E'								=> array( 'Huawei', 'Honor' ),
 			'Huawei C8950D'								=> array( 'Huawei', 'Honor+' ),
 			'Huawei G300'								=> array( 'Huawei', 'Ascend G300' ),
+			'Huawei G7500'								=> array( 'Huawei', 'G7500' ),
+			'Huawei H867G'								=> array( 'Huawei', 'H867G' ),
 			'Huawei M835'								=> array( 'Huawei', 'M835' ),
 			'Huawei M860'								=> array( 'Huawei', 'Ascend' ),
 			'Huawei M920'								=> array( 'Huawei', 'M920' ),
 			'Huawei M921'								=> array( 'Huawei', 'M921' ),
 			'Huawei M931'								=> array( 'Huawei', 'M931' ),
+			'Huawei MT1-U06'							=> array( 'Huawei', 'Ascend Mate' ),
+			'Huawei MT1-T00'							=> array( 'Huawei', 'Ascend Mate' ),
 			'Huawei S8520'								=> array( 'Huawei', 'S8520' ),
 			'Huawei S8600'								=> array( 'Huawei', 'S8600' ),
 			'Huawei T8100'								=> array( 'Huawei', 'T8100' ),
@@ -786,7 +1137,9 @@ class DeviceModels {
 			'Huawei T8620'								=> array( 'Huawei', 'Ascend Y200T' ),
 			'Huawei T8828'								=> array( 'Huawei', 'Ascend G305T' ),
 			'Huawei T8830'								=> array( 'Huawei', 'Ascend G309T' ),
+			'Huawei T8833'								=> array( 'Huawei', 'Ascend Y300' ),
 			'Huawei T8950'								=> array( 'Huawei', 'Honor+' ),
+			'Huawei T8951'								=> array( 'Huawei', 'Ascend G510' ),
 			'Huawei T9200'								=> array( 'Huawei', 'Ascend P1' ),
 			'Huawei U8220'								=> array( 'Huawei', 'U8220' ),
 			'Huawei U8500'								=> array( 'Huawei', 'IDEOS X2' ),
@@ -805,18 +1158,28 @@ class DeviceModels {
 			'Huawei U8850'								=> array( 'Huawei', 'Vision' ),
 			'Huawei U8860'								=> array( 'Huawei', 'Honor' ),
 			'Huawei U8950!'								=> array( 'Huawei', 'Ascend G600' ),
-			'Huawei ?U9000'								=> array( 'Huawei', 'Ascend X' ),
+			'Huawei ?U9000!'							=> array( 'Huawei', 'Ascend X' ),
 			'Huawei U9508'								=> array( 'Huawei', 'Honor 2' ),
+			'Huawei ?U9508!'							=> array( 'Huawei', 'Honor 2 Quad-core' ),
 			'Huawei U9510!'								=> array( 'Huawei', 'Ascend D quad' ),
 			'Huawei D2-0082'							=> array( 'Huawei', 'Ascend D2' ),
+			'Huawei D2-2010'							=> array( 'Huawei', 'Ascend D2' ),
+			'Huawei P2-6011'							=> array( 'Huawei', 'Ascend P2' ),
+			'Huawei P2-6070'							=> array( 'Huawei', 'Ascend P2' ),
 			'Huawei IDEOS U8500'						=> array( 'Huawei', 'IDEOS X2' ),
 			'Huawei IDEOS U8650'						=> array( 'Huawei', 'Sonic' ),
 			'Huawei IDEOS X3'							=> array( 'Huawei', 'IDEOS X3' ),
 			'Huawei Ideos X5!'							=> array( 'Huawei', 'IDEOS X5' ),
 			'Huawei SONIC'								=> array( 'Huawei', 'Sonic' ),
 			'Huawei 8100-9'								=> array( 'Huawei', 'U8100' ),
+			'Huawei Ascend G 300'						=> array( 'Huawei', 'Ascend G300' ),
 			'Ascend G300'								=> array( 'Huawei', 'Ascend G300' ),
+			'Huawei G510!'								=> array( 'Huawei', 'Ascend G510' ),
+			'Huawei G520-5000'							=> array( 'Huawei', 'Ascend G520' ),
+			'Huawei Y210!'								=> array( 'Huawei', 'Ascend Y210' ),
+			'Huawei Y 220T'								=> array( 'Huawei', 'Ascend Y220T' ),
 			'Huawei Y300!'								=> array( 'Huawei', 'Ascend Y300' ),
+			'Huawei Y310!'								=> array( 'Huawei', 'Ascend Y310' ),
 			'Huawei Ascend X'							=> array( 'Huawei', 'Ascend X' ),
 			'FUSIONideos'								=> array( 'Huawei', 'IDEOS' ),
 			'Gnappo Ideos'								=> array( 'Huawei', 'IDEOS' ),
@@ -828,6 +1191,7 @@ class DeviceModels {
 			'Kyivstar Aqua'								=> array( 'Huawei', 'Sonic' ),
 			'Lucky Ultra Sonic U8650'					=> array( 'Huawei', 'Sonic' ),
 			'MTC Android'								=> array( 'Huawei', 'U8110' ),
+			'A01HW'										=> array( 'Huawei', 'eMobile A01HW', TYPE_TABLET ),
 			'S31HW'										=> array( 'Huawei', 'Pocket WiFi S' ),
 			'S41HW'										=> array( 'Huawei', 'Pocket WiFi S II' ),
 			'007HW'										=> array( 'Huawei', 'Vision' ),	
@@ -843,6 +1207,7 @@ class DeviceModels {
 			'C8800'										=> array( 'Huawei', 'C8800' ),
 			'C8810'										=> array( 'Huawei', 'Ascend G300C' ),
 			'C8812'										=> array( 'Huawei', 'Ascend C8812' ),
+			'CM980'										=> array( 'Huawei', 'Evolution II' ),
 			'S8600'										=> array( 'Huawei', 'S8600' ),
 			'T8620'										=> array( 'Huawei', 'Ascend Y200T' ),
 			'T8808!'									=> array( 'Huawei', 'Ascend G306T' ),
@@ -887,63 +1252,99 @@ class DeviceModels {
 			'DroniX-0.5'								=> array( 'Huawei', 'U8180' ),
 			'MTS-SP101'									=> array( 'Huawei', 'C8511' ),
 			'TSP21'										=> array( 'Huawei', 'U8110' ),
-			'HW-01E'									=> array( 'Huawei', 'Ascend HW-01E' ),								
+			'HW-01E'									=> array( 'Huawei', 'Ascend HW-01E' ),	
+			'H866C'										=> array( 'Huawei', 'Ascend Y H866C' ),								
+			'A7 HD'										=> array( 'Hyundai', 'A7 HD', TYPE_TABLET ),
 			'HYUNDAI H6'								=> array( 'Hyundai', 'Storm H6' ),
+			'HYUNDAI H8Q'								=> array( 'Hyundai', 'H8Q' ),
+			'HYUNDAI T7'								=> array( 'Hyundai', 'T7', TYPE_TABLET ),
 			'MW1031'									=> array( 'Hyundai', 'MW1031', TYPE_TABLET ),
+			'Andi3n'									=> array( 'iBall', 'Andi3n' ),
+			'iBall Andi3e'								=> array( 'iBall', 'Andi3e' ),
 			'iBall i6012'								=> array( 'iBall', 'Slide i6012', TYPE_TABLET ),
 			'iBall Slide i7011'							=> array( 'iBall', 'Slide i7011', TYPE_TABLET ),
 			'iBall Slide 3G 7334'						=> array( 'iBall', 'Slide 3G 7334', TYPE_TABLET ),
+			'AUXUS CoreX2 3G'							=> array( 'iBerry', 'Auxus CoreX2', TYPE_TABLET ),
 			'NetTAB RUNE'								=> array( 'IconBit', 'NetTab Rune', TYPE_TABLET ),
+			'NetTAB SPACE II Plus'						=> array( 'IconBit', 'NetTab Space II Plus', TYPE_TABLET ),
 			'NetTAB THOR-LE'							=> array( 'IconBit', 'NetTab Thor LE', TYPE_TABLET ),
 			'D70W'										=> array( 'Icoo', 'D70W', TYPE_TABLET ),
 			'D80'										=> array( 'Icoo', 'D80', TYPE_TABLET ),
 			'INFOBAR A01'								=> array( 'iida', 'INFOBAR A01' ),
 			'IMO S88'									=> array( 'IMO', 'Discovery S88' ),
 			'IMO S89'									=> array( 'IMO', 'Miracle S89' ),
+			'IMO S99'									=> array( 'IMO', 'Ocean S99' ),
+			'IMO S900'									=> array( 'IMO', 'Groovy S900' ),
+			'IMO X2'									=> array( 'IMO', 'Normandy X2' ),
+			'IMO X2 NORMANDY'							=> array( 'IMO', 'Normandy X2' ),
 			'M009F'										=> array( 'Infotmic', 'M009F' ),
+			'INHON PAPILIO G1'							=> array( 'Inhon', 'Papilio G1' ),
+			'innos i6'									=> array( 'Innos', 'i6' ),
 			'AZ210A'									=> array( 'Intel', 'AZ210A' ),
 			'AZ210B'									=> array( 'Intel', 'AZ210B' ),
 			'AZ510'										=> array( 'Intel', 'AZ510' ),
 			'BT210'										=> array( 'Intel', 'BT210' ),
+			'BT230'										=> array( 'Intel', 'BT230' ),
 			'BT510'										=> array( 'Intel', 'BT510' ),
 			'greenridge'								=> array( 'Intel', 'Green Ridge', TYPE_TABLET ),
 			'INQ Cloud Touch'							=> array( 'INQ', 'Cloud Touch' ),
 			'NS-13T001'									=> array( 'Insignia', 'Flex Tablet', TYPE_TABLET ),
+			'IPRO i5S'									=> array( 'IPRO', 'i5S' ),
 			'ILT-MX100'									=> array( 'iRiver', 'Tab', TYPE_TABLET ),
-			'IVIO_DE38'									=> array( 'Ivio', 'DE38' ),
+			'IVIO DE38'									=> array( 'Ivio', 'DE38' ),
+			'iwoo i900'									=> array( 'iwoo', 'i900' ),
+			'JY-G1'										=> array( 'Jiayu', 'G1' ),
 			'JY-G2'										=> array( 'Jiayu', 'G2' ),
 			'JY-G2L'									=> array( 'Jiayu', 'G2' ),
+			'Jiayu G2'									=> array( 'Jiayu', 'G2' ),
+			'Jiayu G2s'									=> array( 'Jiayu', 'G2' ),
 			'JY-G3'										=> array( 'Jiayu', 'G3' ),
+			'Jiayu G3'									=> array( 'Jiayu', 'G3' ),
 			'JT-Smart PC01'								=> array( 'Joy-IT', 'JT-Smart PC-01' ),
 			'JXD S601WIFI'								=> array( 'JXD', 'S601 WIFI', 'media' ),
+			'JXD V5200'									=> array( 'JXD', 'V5200', 'media' ),
 			'A2'										=> array( 'KakaTech', 'A2' ),
-			'Karbonn A21'								=> array( 'Karbonn', 'A21' ),
+			'Karbonn A1'								=> array( 'Karbonn', 'A1' ),
+			'Karbonn A2'								=> array( 'Karbonn', 'A2' ),
+			'Karbonn A9+'								=> array( 'Karbonn', 'A9+' ),
+			'A11'										=> array( 'Karbonn', 'A11' ),
+			'Karbonn A18'								=> array( 'Karbonn', 'A18' ),
+			'Karbonn A21!'								=> array( 'Karbonn', 'A21' ),
+			'A21'										=> array( 'Karbonn', 'A21' ),
+			'Karbonn A30'								=> array( 'Karbonn', 'A30' ),
+			'SmartTab1'									=> array( 'Karbonn', 'Smart Tab 1', TYPE_TABLET ),
 			'ST10'										=> array( 'Karbonn', 'Smart Tab 10 Cosmic', TYPE_TABLET ),
 			'D91'										=> array( 'KK', 'D91', TYPE_TABLET ),
 			'K080'										=> array( 'Kobo', 'K080', TYPE_EREADER ),
 			'W990'										=> array( 'Konka', 'W990' ),
 			'A106'										=> array( 'koobee', 'A160' ),
+			'Koobe S7 Easy tablet'						=> array( 'Koobe', 'S7 Easy tablet', TYPE_TABLET ),
 			'KPT A9'									=> array( 'KPT', 'A9' ),
 			'EV-S100'									=> array( 'Kttech', 'Take EV-S100' ),
 			'KM-E100'									=> array( 'Kttech', 'Take LTE KM-E100' ),
 			'KM-S120'									=> array( 'Kttech', 'Take 2 KM-S120' ),
 			'KM-S200'									=> array( 'Kttech', 'Take Janus KM-S200' ),
 			'KM-S220'									=> array( 'Kttech', 'Take Tachy KM-S220' ),
+			'KM-S300'									=> array( 'Kttech', 'Take HD KM-S300' ),
 			'Kyobo mirasol eReader'						=> array( 'Kyobo', 'eReader', TYPE_EREADER ),
 			'ISW11K'									=> array( 'Kyocera', 'Digno' ),
 			'KYL21'										=> array( 'Kyocera', 'Digno S' ),
+			'WX04K'										=> array( 'Kyocera', 'Digno Duo' ),
 			'JC-KSP8000'								=> array( 'Kyocera', 'Echo' ),
 			'KSP8000'									=> array( 'Kyocera', 'Echo' ),
+			'Rise'										=> array( 'Kyocera', 'Rise' ),
 			'Zio'										=> array( 'Kyocera', 'Zio' ),
 			'C5155'										=> array( 'Kyocera', 'C5155' ),
 			'C5170'										=> array( 'Kyocera', 'C5170' ),
 			'M9300'										=> array( 'Kyocera', 'M9300' ),
 			'K-Touch E619'								=> array( 'K-Touch', 'E619' ),
 			'E800'										=> array( 'K-Touch', 'E800' ),
+			'K-Touch E806'								=> array( 'K-Touch', 'E806' ),
 			'K-TouchT580'								=> array( 'K-Touch', 'T580' ),
 			'K-Touch T619'								=> array( 'K-Touch', 'T619' ),
 			'K-Touch U6'								=> array( 'K-Touch', 'U6' ),
 			'K-Touch U10'								=> array( 'K-Touch', 'U10' ),
+			'K-Touch U86'								=> array( 'K-Touch', 'U86' ),
 			'K-Touch V8'								=> array( 'K-Touch', 'V8' ),
 			'K-Touch V9'								=> array( 'K-Touch', 'V9' ),
 			'W606'										=> array( 'K-Touch', 'W606' ),
@@ -951,130 +1352,173 @@ class DeviceModels {
 			'K-Touch W621'								=> array( 'K-Touch', 'W621' ),
 			'K-Touch W650'								=> array( 'K-Touch', 'W650' ),
 			'K-Touch W658'								=> array( 'K-Touch', 'W658' ),
+			'W686'										=> array( 'K-Touch', 'W686' ),
 			'K-Touch W688'								=> array( 'K-Touch', 'W688' ),
 			'W700'										=> array( 'K-Touch', 'W700' ),
 			'K-Touch W719'								=> array( 'K-Touch', 'W719' ),
 			'W732'										=> array( 'K-Touch', 'W732' ),
 			'K-Touch W760'								=> array( 'K-Touch', 'W760' ),
+			'K-Touch W780'								=> array( 'K-Touch', 'W780' ),
 			'W800'										=> array( 'K-Touch', 'W800' ),
 			'K-Touch W806!'								=> array( 'K-Touch', 'W806' ),
 			'W806'										=> array( 'K-Touch', 'W806' ),
 			'W808'										=> array( 'K-Touch', 'W808' ),
 			'W810'										=> array( 'K-Touch', 'W810' ),
 			'W880'										=> array( 'K-Touch', 'W880' ),
+			'LAVA S12'									=> array( 'Lava', 'S12' ),
 			'XOLO A700'									=> array( 'Lava', 'XOLO A700' ),
 			'XOLO A800'									=> array( 'Lava', 'XOLO A800' ),
+			'XOLO A1000'								=> array( 'Lava', 'XOLO A1000' ),
+			'XOLO Q800'									=> array( 'Lava', 'XOLO Q800' ),
 			'Xolo X500'									=> array( 'Lava', 'XOLO X500' ),
 			'X900'										=> array( 'Lava', 'XOLO X900' ),
 			'Xolo X900'									=> array( 'Lava', 'XOLO X900' ),
+			'XOLO X1000'								=> array( 'Lava', 'XOLO X1000' ),
+			'leepoo i500'								=> array( 'Leepoo', 'i500' ),
+			'leepoo i600'								=> array( 'Leepoo', 'i600' ),
 			'LENCM900HZ'								=> array( 'Lenco', 'TAB 811', TYPE_TABLET ),
+			'Lenco TAB-1014'							=> array( 'Lenco', 'TAB 1014', TYPE_TABLET ),
 			'ThinkPad( Tablet)?!'						=> array( 'Lenovo', 'ThinkPad Tablet', TYPE_TABLET ),
+			'Lenovo A1-32AB0'							=> array( 'Lenovo', 'IdeaPad A1', TYPE_TABLET ),
 			'(Ideapad )?K1!'							=> array( 'Lenovo', 'IdeaPad K1', TYPE_TABLET ),
 			'Ideapad S10-3T'							=> array( 'Lenovo', 'IdeaPad S10-3T', TYPE_TABLET ),
-			'S2005A-H'									=> array( 'Lenovo', 'S2005A' ),
-			'IdeaTab ?A2107(A-F|A-H)!'					=> array( 'Lenovo', 'IdeaTab A2107A', TYPE_TABLET ),
-			'IdeaTab ?A2109(A)!'						=> array( 'Lenovo', 'IdeaTab A2109A', TYPE_TABLET ),
-			'IdeaTab ?A2207(A-H)!'						=> array( 'Lenovo', 'IdeaTab A2207A', TYPE_TABLET ),
-			'IdeaTab ?K2110(A-F)!'						=> array( 'Lenovo', 'IdeaTab K2110A', TYPE_TABLET ),
-			'IdeaTab ?S2007(A-D)!'						=> array( 'Lenovo', 'IdeaTab S2007A', TYPE_TABLET ),
-			'IdeaTab ?S2109(A-F)!'						=> array( 'Lenovo', 'IdeaTab S2109A', TYPE_TABLET ),
-			'IdeaTab ?V2007(A|A-D-I)!'					=> array( 'Lenovo', 'IdeaTab V2007A', TYPE_TABLET ),
-			'IdeaTab ?V2010(A)!'						=> array( 'Lenovo', 'IdeaTab V2010A', TYPE_TABLET ),
+			'IdeaTab ?A1000-T!'							=> array( 'Lenovo', 'IdeaTab A1000', TYPE_TABLET ),
+			'IdeaTab ?A1107!'							=> array( 'Lenovo', 'IdeaTab A1107', TYPE_TABLET ),
+			'IdeaTab ?A2107(A-F|A-H)!'					=> array( 'Lenovo', 'IdeaTab A2107', TYPE_TABLET ),
+			'A2107A-H'									=> array( 'Lenovo', 'IdeaTab A2107', TYPE_TABLET ),
+			'IdeaTab ?A2109(A)!'						=> array( 'Lenovo', 'IdeaTab A2109', TYPE_TABLET ),
+			'IdeaTab ?A2207(A-H)!'						=> array( 'Lenovo', 'IdeaTab A2207', TYPE_TABLET ),
+			'IdeaTab ?A3000-H!'							=> array( 'Lenovo', 'IdeaTab A3000', TYPE_TABLET ),
+			'IdeaTab ?K2110(A-F)!'						=> array( 'Lenovo', 'IdeaTab K2110', TYPE_TABLET ),
+			'S2005A-H'									=> array( 'Lenovo', 'IdeaTab S2005', TYPE_TABLET ),
+			'IdeaTab ?S2007(A-D)!'						=> array( 'Lenovo', 'IdeaTab S2007', TYPE_TABLET ),
+			'IdeaTab ?S2010(A-D)!'						=> array( 'Lenovo', 'IdeaTab S2010', TYPE_TABLET ),
+			'IdeaTab ?S2109(A-F)!'						=> array( 'Lenovo', 'IdeaTab S2109', TYPE_TABLET ),
+			'IdeaTab ?S2110(AH)!'						=> array( 'Lenovo', 'IdeaTab S2110', TYPE_TABLET ),
+			'IdeaTab ?S6000-(F|H)!'							=> array( 'Lenovo', 'IdeaTab S6000', TYPE_TABLET ),
+			'IdeaTab ?V2007(A|A-D-I)!'					=> array( 'Lenovo', 'IdeaTab V2007', TYPE_TABLET ),
+			'IdeaTab ?V2010(A)!'						=> array( 'Lenovo', 'IdeaTab V2010', TYPE_TABLET ),
 			'A1 07'										=> array( 'Lenovo', 'LePad', TYPE_TABLET ),
 			'lepad 001b'								=> array( 'Lenovo', 'LePad', TYPE_TABLET ),
 			'lepad 001n'								=> array( 'Lenovo', 'LePad', TYPE_TABLET ),
 			'(Lenovo )?3GC101!'							=> array( 'Lenovo', 'LePhone 3GC101' ),
 			'(Lenovo |Lephone )?3GW100!'				=> array( 'Lenovo', 'LePhone 3GW100' ),
 			'(Lenovo |Lephone )?3GW101!'				=> array( 'Lenovo', 'LePhone 3GW101' ),
-			'Lenovo A1-32AB0'							=> array( 'Lenovo', 'LePhone A1-32AB0' ),
-			'Lenovo S1-37AH0'							=> array( 'Lenovo', 'LePhone S1-37AH0' ),
-			'S1 37AHO'									=> array( 'Lenovo', 'LePhone S1-37AH0' ),
-			'Lenovo S2-38AH0'							=> array( 'Lenovo', 'LePhone S2-38AH0' ),
-			'Lenovo S2-38AT0'							=> array( 'Lenovo', 'LePhone S2-38AT0' ),
-			'Lenovo A288t'								=> array( 'Lenovo', 'LePhone A288' ),
-			'Lenovo A300'								=> array( 'Lenovo', 'LePhone A300' ),
-			'Lenovo A326'								=> array( 'Lenovo', 'LePhone A326' ),
-			'Lenovo A365e'								=> array( 'Lenovo', 'LePhone A365' ),
-			'Lenovo A366t'								=> array( 'Lenovo', 'LePhone A366' ),
-			'Lenovo A390e'								=> array( 'Lenovo', 'LePhone A390' ),
-			'Lenovo A500'								=> array( 'Lenovo', 'LePhone A500' ),
-			'Lenovo A520!'								=> array( 'Lenovo', 'LePhone A520' ),
-			'Lenovo A560e'								=> array( 'Lenovo', 'LePhone A560' ),
-			'Lenovo A580'								=> array( 'Lenovo', 'LePhone A580' ),
-			'Lenovo A586'								=> array( 'Lenovo', 'LePhone A586' ),
-			'Lenovo A630'								=> array( 'Lenovo', 'LePhone A630' ),
-			'Lenovo A660'								=> array( 'Lenovo', 'LePhone A660' ),
-			'Lenovo A690'								=> array( 'Lenovo', 'LePhone A690' ),
-			'Lenovo A668t'								=> array( 'Lenovo', 'LePhone A668' ),
-			'Lenovo A698t'								=> array( 'Lenovo', 'LePhone A698' ),
-			'Lenovo A700e'								=> array( 'Lenovo', 'LePhone A700' ),
-			'Lenovo A710e'								=> array( 'Lenovo', 'LePhone A710' ),
-			'Lenovo A750'								=> array( 'Lenovo', 'LePhone A750' ),
-			'Lenovo A780'								=> array( 'Lenovo', 'LePhone A780' ),
-			'Lenovo A789'								=> array( 'Lenovo', 'LePhone A789' ),
-			'Lenovo A790e'								=> array( 'Lenovo', 'LePhone A790' ),
-			'Lenovo A798t'								=> array( 'Lenovo', 'LePhone A798' ),
-			'Lenovo K860'								=> array( 'Lenovo', 'LePhone K860' ),
-			'Lenovo P70'								=> array( 'Lenovo', 'LePhone P70' ),
-			'Lenovo P700!'								=> array( 'Lenovo', 'LePhone P700' ),
+			'(Lenovo )?S1[- ]37AH0!'					=> array( 'Lenovo', 'LePhone S1' ),
+			'(Lenovo )?S2[- ]38A(H0|T0)!'				=> array( 'Lenovo', 'LePhone S2' ),
+			'lephone 1800'								=> array( 'Lenovo', 'LePhone 1800' ),
+			'A30t'										=> array( 'Lenovo', 'A30' ),
+			'Lenovo A60+?!'								=> array( 'Lenovo', 'A60' ),
+			'Lenovo A65'								=> array( 'Lenovo', 'A65' ),
+			'Lenovo A66t'								=> array( 'Lenovo', 'A66' ),
+			'Lenovo A68e'								=> array( 'Lenovo', 'A68' ),
+			'Lenovo A278t'								=> array( 'Lenovo', 'A278' ),
+			'Lenovo A288t'								=> array( 'Lenovo', 'A288' ),
+			'Lenovo A298t'								=> array( 'Lenovo', 'A298' ),
+			'Lenovo A300'								=> array( 'Lenovo', 'A300' ),
+			'Lenovo A326'								=> array( 'Lenovo', 'A326' ),
+			'Lenovo A356'								=> array( 'Lenovo', 'A356' ),
+			'Lenovo A365e'								=> array( 'Lenovo', 'A365' ),
+			'Lenovo A366t'								=> array( 'Lenovo', 'A366' ),
+			'Lenovo A370e'								=> array( 'Lenovo', 'A370' ),
+			'Lenovo A390!'								=> array( 'Lenovo', 'A390' ),
+			'Lenovo A500'								=> array( 'Lenovo', 'A500' ),
+			'Lenovo A520!'								=> array( 'Lenovo', 'A520' ),
+			'Lenovo A530'								=> array( 'Lenovo', 'A530' ),
+			'Lenovo A560e'								=> array( 'Lenovo', 'A560' ),
+			'Lenovo A580'								=> array( 'Lenovo', 'A580' ),
+			'Lenovo A586'								=> array( 'Lenovo', 'A586' ),
+			'Lenovo A630!'								=> array( 'Lenovo', 'A630' ),
+			'Lenovo A660'								=> array( 'Lenovo', 'A660' ),
+			'Lenovo A690'								=> array( 'Lenovo', 'A690' ),
+			'Lenovo A668t'								=> array( 'Lenovo', 'A668' ),
+			'Lenovo A698t'								=> array( 'Lenovo', 'A698' ),
+			'Lenovo A700e'								=> array( 'Lenovo', 'A700' ),
+			'Lenovo A710e'								=> array( 'Lenovo', 'A710' ),
+			'Lenovo A750'								=> array( 'Lenovo', 'A750' ),
+			'A750'										=> array( 'Lenovo', 'A750' ),	
+			'Lenovo A765!'								=> array( 'Lenovo', 'A765' ),	
+			'Lenovo A780'								=> array( 'Lenovo', 'A780' ),
+			'Lenovo A789'								=> array( 'Lenovo', 'A789' ),
+			'Lenovo A790e'								=> array( 'Lenovo', 'A790' ),
+			'Lenovo A798t'								=> array( 'Lenovo', 'A798' ),
+			'Lenovo A800'								=> array( 'Lenovo', 'A800' ),
+			'Lenovo A820!'								=> array( 'Lenovo', 'A820' ),
+			'Lenovo K800'								=> array( 'Lenovo', 'K800' ),
+			'Lenovo K860!'								=> array( 'Lenovo', 'K860' ),
+			'Lenovo P70'								=> array( 'Lenovo', 'P70' ),
+			'Lenovo P700!'								=> array( 'Lenovo', 'P700' ),
+			'Lenovo P770'								=> array( 'Lenovo', 'P770' ),
 			'Lenovo S560'								=> array( 'Lenovo', 'S560' ),
 			'Lenovo S680'								=> array( 'Lenovo', 'S680' ),
+			'Lenovo S686'								=> array( 'Lenovo', 'S686' ),
 			'Lenovo S720'								=> array( 'Lenovo', 'S720' ),
 			'S720i'										=> array( 'Lenovo', 'S720' ),
+			'Lenovo S760'								=> array( 'Lenovo', 'S760' ),
 			'Lenovo S850e'								=> array( 'Lenovo', 'S850' ),
-			'Lenovo S880'								=> array( 'Lenovo', 'S880' ),
+			'Lenovo S870e'								=> array( 'Lenovo', 'S870' ),
+			'Lenovo S880!'								=> array( 'Lenovo', 'S880' ),
+			'Lenovo S890'								=> array( 'Lenovo', 'S890' ),
 			'Lenovo ?S899!'								=> array( 'Lenovo', 'S899' ),
-			'A30t'										=> array( 'Lenovo', 'A30t' ),
-			'Lenovo A60+?!'								=> array( 'Lenovo', 'A60' ),
-			'Lenovo A65'								=> array( 'Lenovo', 'A65' ),
-			'Lenovo A66t'								=> array( 'Lenovo', 'A66t' ),
-			'Lenovo A68e'								=> array( 'Lenovo', 'A68e' ),
-			'Lenovo K800'								=> array( 'Lenovo', 'K800' ),
-			'Lenovo K860i'								=> array( 'Lenovo', 'K860' ),
+			'Lenovo S920'								=> array( 'Lenovo', 'S920' ),
+			'ideatv A21'								=> array( 'Lenovo', 'IDEA TV', TYPE_TELEVISION ),
 			'IDEA TV T100'								=> array( 'Lenovo', 'IDEA TV', TYPE_TELEVISION ),
 			'IDEA TV K91'								=> array( 'Lenovo', 'IDEA TV', TYPE_TELEVISION ),
 			'TC970'										=> array( 'Le Pan', 'TC970', TYPE_TABLET ),
 			'LePanII'									=> array( 'Le Pan', 'II', TYPE_TABLET ),
+			'Le Pan S'									=> array( 'Le Pan', 'S', TYPE_TABLET ),
 			'LG-C5(50|55)!'								=> array( 'LG', 'Optimus Chat' ),
 			'LG-C660!'									=> array( 'LG', 'Optimus Pro' ),
 			'LG-C710!'									=> array( 'LG', 'Aloha' ),
 			'LG-C729'									=> array( 'LG', 'DoublePlay' ),
 			'LG-C800G'									=> array( 'LG', 'Eclypse' ),
 			'LG-CX670'									=> array( 'LG', 'Optimus 3G' ),
+			'LG-D500'									=> array( 'LG', 'D500' ),
+			'LG-D700'									=> array( 'LG', 'D700' ),
+			'LG-D801'									=> array( 'LG', 'D801' ),
 			'LG-E400!'									=> array( 'LG', 'Optimus L3' ),
 			'LG-E405!'									=> array( 'LG', 'Optimus L3 Dual' ),
+			'LG-E410!'									=> array( 'LG', 'Optimus L3' ),
 			'LG-E425!'									=> array( 'LG', 'E425' ),
-			'LG-E430!'									=> array( 'LG', 'E430' ),
-			'LG-E435!'									=> array( 'LG', 'E435' ),
+			'LG-E430!'									=> array( 'LG', 'Optimus L3 II' ),
+			'LG-E435!'									=> array( 'LG', 'Optimus L3 II Dual' ),
+			'LG-E440!'									=> array( 'LG', 'E440' ),
 			'LG-E445!'									=> array( 'LG', 'E445' ),
-			'LG-E450!'									=> array( 'LG', 'E450' ),
-			'LG-E455!'									=> array( 'LG', 'E455' ),
+			'LG-E450!'									=> array( 'LG', 'Optimus L5 II' ),
+			'LG-E455!'									=> array( 'LG', 'Optimus L5 II Dual' ),
 			'LG-E460!'									=> array( 'LG', 'E460' ),
+			'LG-E470!'									=> array( 'LG', 'E470' ),
 			'LG-E510!'									=> array( 'LG', 'Optimus Hub' ),
 			'LG-E6(10|12|17)!'							=> array( 'LG', 'Optimus L5' ),
 			'LG-E615!'									=> array( 'LG', 'Optimus L5 Dual' ),
 			'LG-E720!'									=> array( 'LG', 'Optimus Chic' ),
-			'LG-E730'									=> array( 'LG', 'Optimus Sol' ),
+			'LG-E730!'									=> array( 'LG', 'Optimus Sol' ),
+			'LG-E940'									=> array( 'LG', 'Optimus G Pro' ),
 			'LG-E960'									=> array( 'LG', 'Nexus 4' ),
 			'LG-E9(70|71|73|75|76|77|78)!'				=> array( 'LG', 'Optimus G' ),
-			'LG-E980!'									=> array( 'LG', 'Optimus G2' ),
+			'LG-E980!'									=> array( 'LG', 'E980' ),
+			'LG-E988'									=> array( 'LG', 'E988' ),
 			'LG-F100!'									=> array( 'LG', 'Optimus Vu' ),
 			'LG-F120!'									=> array( 'LG', 'Optimus LTE Tag' ),
 			'LG-F160!'									=> array( 'LG', 'Optimus LTE II' ),
 			'LG-F180!'									=> array( 'LG', 'Optimus G' ),
 			'LG-F200!'									=> array( 'LG', 'Optimus Vu 2' ),
-			'LG-F240!'									=> array( 'LG', 'F240' ),
+			'LG-F240!'									=> array( 'LG', 'Optimus G Pro' ),
 			'LG-F260!'									=> array( 'LG', 'F260' ),
+			'LG-F320!'									=> array( 'LG', 'F320' ),
 			'LG-GT540!'									=> array( 'LG', 'Optimus' ),
 			'LG-GW620'									=> array( 'LG', 'GW620 Eve' ),
 			'LG-KH5200'									=> array( 'LG', 'Andro-1' ),
 			'LG-KU3700'									=> array( 'LG', 'Optimus One' ),
 			'LG-KU5400'									=> array( 'LG', 'PRADA 3.0' ),
 			'LG-KU5900'									=> array( 'LG', 'Optimus Black' ),
+			'LG-L25L'									=> array( 'LG', 'L25L' ),
+			'LG-L38C'									=> array( 'LG', 'Optimus Dynamic' ),
 			'LG-L40G'									=> array( 'LG', 'L40G' ),
 			'LG-L160L'									=> array( 'LG', 'L160L' ),
 			'LG-LG730'									=> array( 'LG', 'Venice' ),
 			'LG-LG855'									=> array( 'LG', 'Marquee' ),
+			'LG-LG870'									=> array( 'LG', 'LG870' ),
 			'LG-LS670'									=> array( 'LG', 'Optimus S' ),
 			'LG-LS696'									=> array( 'LG', 'Elite' ),
 			'LG-LS720'									=> array( 'LG', 'LS720' ),
@@ -1093,6 +1537,7 @@ class DeviceModels {
 			'LG-LW690'									=> array( 'LG', 'Optimus C' ),
 			'LG-LW770'									=> array( 'LG', 'Regard' ),
 			'LG-MS690'									=> array( 'LG', 'Optimus M' ),
+			'LGMS769'									=> array( 'LG', 'MS769' ),
 			'LG-MS770'									=> array( 'LG', 'Motion 4G' ),
 			'LG-MS790'									=> array( 'LG', 'MS790' ),
 			'LG-MS840'									=> array( 'LG', 'Connect 4G' ),
@@ -1105,12 +1550,13 @@ class DeviceModels {
 			'LG-P505!'									=> array( 'LG', 'Phoenix' ),
 			'LG-P506'									=> array( 'LG', 'Thrive' ),
 			'LG-P509'									=> array( 'LG', 'Optimus T' ),
+			'LG-P659'									=> array( 'LG', 'P659' ),
 			'LG-P6(90|98)!'								=> array( 'LG', 'Optimus Net' ),
 			'LG-P693!'									=> array( 'LG', 'P693' ),
 			'LG-P698!'									=> array( 'LG', 'Optimus Net Dual' ),
 			'LG-P7(00|05|08)!'							=> array( 'LG', 'Optimus L7' ),
-			'LG-P710!'									=> array( 'LG', 'P710' ),
-			'LG-P715!'									=> array( 'LG', 'P715' ),
+			'LG-P710!'									=> array( 'LG', 'Optimus L7 II' ),
+			'LG-P715!'									=> array( 'LG', 'Optimus L7 II Dual' ),
 			'LG-P720!'									=> array( 'LG', 'Optimus Chic' ),
 			'LG-P725'									=> array( 'LG', 'Optimus 3D Max' ),
 			'LG-P7(60|65|68|69)!'						=> array( 'LG', 'Optimus L9' ),
@@ -1141,6 +1587,7 @@ class DeviceModels {
 			'LG-VM670'									=> array( 'LG', 'Optimus V' ),
 			'LG-VM696'									=> array( 'LG', 'Optimus Elite' ),
 			'LG-VM701'									=> array( 'LG', 'Optimus Slider' ),
+			'LG-VS410!'									=> array( 'LG', 'VS410' ),
 			'LG-VS660'									=> array( 'LG', 'Vortex' ),
 			'LG-VS700'									=> array( 'LG', 'Enlighten' ),
 			'LG-VS740'									=> array( 'LG', 'Ally' ),
@@ -1155,7 +1602,7 @@ class DeviceModels {
 			'GT540'										=> array( 'LG', 'Optimus GT540' ),
 			'GW620'										=> array( 'LG', 'Eve' ),
 			'KU9500'									=> array( 'LG', 'Optimus Z' ),
-			'LGC660'									=> array( 'LG', 'Optimus Pro' ),
+			'LGC660!'									=> array( 'LG', 'Optimus Pro' ),
 			'LGL21'										=> array( 'LG', 'Optimus G' ),
 			'LGL45C'									=> array( 'LG', 'Optimus Net' ),
 			'LGL55C'									=> array( 'LG', 'Optimus Q' ),
@@ -1178,7 +1625,9 @@ class DeviceModels {
 			'L-02D'										=> array( 'LG', 'PRADA phone' ),
 			'L-02E'										=> array( 'LG', 'Optimus LIFE' ),
 			'L-04C'										=> array( 'LG', 'Optimus Chat' ),
+			'L-04E'										=> array( 'LG', 'Optimus G Pro' ),
 			'L-05D'										=> array( 'LG', 'Optimus it' ),
+			'L-05E'										=> array( 'LG', 'L-05E' ),
 			'L-06C'										=> array( 'LG', 'Optimus Pad', TYPE_TABLET ),
 			'L-06D'										=> array( 'LG', 'Optimus Vu' ),
 			'L-07C'										=> array( 'LG', 'Optimus Bright' ),
@@ -1188,8 +1637,12 @@ class DeviceModels {
 			'LG-GT540 Optimus'							=> array( 'LG', 'Optimus' ),
 			'LG-Optimus Black'							=> array( 'LG', 'Optimus Black' ),
 			'LG-Optimus V'								=> array( 'LG', 'Optimus V' ),
+			'LG-OPTIMUS HD LTE'							=> array( 'LG', 'Optimus HD' ),
+			'LG-OPTIMUS LTE HD'							=> array( 'LG', 'Optimus HD' ),
 			'Ally'										=> array( 'LG', 'Ally' ),
 			'Optimus'									=> array( 'LG', 'Optimus' ),
+			'OptimusBlack'								=> array( 'LG', 'Optimus Black' ),
+			'Optimus G'									=> array( 'LG', 'Optimus G' ),
 			'Optimus Me'								=> array( 'LG', 'Optimus Me' ),
 			'optimus me p350'							=> array( 'LG', 'Optimus Me' ),
 			'Optimus 2X'								=> array( 'LG', 'Optimus 2X' ),
@@ -1197,25 +1650,35 @@ class DeviceModels {
 			'IS11LG'									=> array( 'LG', 'Optimus X' ),
 			'Vortex'									=> array( 'LG', 'Vortex' ),
 			'LDK-ICK v1.4'								=> array( 'LG', 'Esteem' ),
+			'Prada 3.0'									=> array( 'LG', 'PRADA 3.0' ),
+			'LG-Google TV'								=> array( 'LG', 'Google TV', TYPE_TELEVISION, FLAG_GOOGLETV ),
 			'T6'										=> array( 'Malata', 'Zpad T6', TYPE_TABLET ),
 			'Malata SMBA1002'							=> array( 'Malata', 'Tablet SMB-A1002', TYPE_TABLET ),
 			'MID05V2'									=> array( 'Manta', 'Powertab MID05V2', TYPE_TABLET ),
+			'MID801'									=> array( 'Manta', 'MID801 Duo Power HD', TYPE_TABLET ),
 			'M-270'										=> array( 'Maylong', 'M-270', TYPE_TABLET ),
+			'M70'										=> array( 'Maxsun', 'M70', TYPE_TABLET ),
 			'MP705C'									=> array( 'Mediacom', 'SmartPad 705c', TYPE_TABLET ),
 			'STM712HCZ'									=> array( 'Mediacom', 'SmartPad 712c', TYPE_TABLET ),
 			'STM803HC'									=> array( 'Mediacom', 'SmartPad 810c', TYPE_TABLET ),
 			'Mediacom 810C'								=> array( 'Mediacom', 'SmartPad 810c', TYPE_TABLET ),
 			'Xteam Smartpad 810c'						=> array( 'Mediacom', 'SmartPad 810c', TYPE_TABLET ),
+			'Xteam 4.8 Smartpad 810c'					=> array( 'Mediacom', 'SmartPad 810c', TYPE_TABLET ),
 			'SmartPad810c'								=> array( 'Mediacom', 'SmartPad 810c', TYPE_TABLET ),
 			'MP810C'									=> array( 'Mediacom', 'SmartPad 810c', TYPE_TABLET ),
+			'M-MP855i'									=> array( 'Mediacom', 'SmartPad 855i', TYPE_TABLET ),
+			'SmartPad870'								=> array( 'Mediacom', 'SmartPad 870 S2', TYPE_TABLET ),
 			'M-MP875S2'									=> array( 'Mediacom', 'SmartPad 875 S2', TYPE_TABLET ),
 			'MP907C'									=> array( 'Mediacom', 'SmartPad 907c', TYPE_TABLET ),
 			'932i'										=> array( 'Mediacom', 'SmartPad 932i', TYPE_TABLET ),
+			'SmartPad970s2'								=> array( 'Mediacom', 'SmartPad 970 S2', TYPE_TABLET ),
+			'SmartPad1010i'								=> array( 'Mediacom', 'SmartPad 1010i', TYPE_TABLET ),
 			'MT7003'									=> array( 'Mediadroid', 'Imperius' ),
 			'MTK6516'									=> array( 'Mediatek', 'MTK6516' ),
 			'LIFETAB S9512'								=> array( 'Medion', 'Lifetab S9512', TYPE_TABLET ),
 			'LIFETAB P9514'								=> array( 'Medion', 'Lifetab P9514', TYPE_TABLET ),
 			'MD LIFETAB P9516'							=> array( 'Medion', 'Lifetab P9516', TYPE_TABLET ),
+			'MEDION Smartphone LIFE E3501'				=> array( 'Medion', 'Life E3501' ),
 			'MEDION LIFE P4012'							=> array( 'Medion', 'Life P4012' ),
 			'MEDION LIFE P4310'							=> array( 'Medion', 'Life P4310' ),
 			'M8'										=> array( 'Meizu', 'M8' ),
@@ -1228,10 +1691,14 @@ class DeviceModels {
 			'M032'										=> array( 'Meizu', 'MX M032' ),
 			'M040'										=> array( 'Meizu', 'M040' ),
 			'Slidepad'									=> array( 'Memup', 'Slidepad', TYPE_TABLET ),
+			'SP-A20i'									=> array( 'Мегафон', 'SP-A20i Mint' ),
+			'Micromax A25'								=> array( 'Micromax', 'A25 Smarty' ),
 			'Micromax A44'								=> array( 'Micromax', 'A44 Punk' ),
 			'A45'										=> array( 'Micromax', 'A45 Punk' ),
 			'Micromax A50'								=> array( 'Micromax', 'A50 Ninja' ),
 			'Micromax A52'								=> array( 'Micromax', 'A52 Aisha' ),
+			'A52'										=> array( 'Micromax', 'A52 Aisha' ),
+			'Micromax-Xzoom A52'						=> array( 'Micromax', 'A52 Aisha' ),
 			'Micromax A56'								=> array( 'Micromax', 'A56 Ninja 2' ),
 			'Micromax A57'								=> array( 'Micromax', 'A57 Ninja 3' ),
 			'Micromax A60'								=> array( 'Micromax', 'Andro A60' ),
@@ -1243,16 +1710,30 @@ class DeviceModels {
 			'Micromax A80'								=> array( 'Micromax', 'A80 Infinity' ),
 			'Micromax A84'								=> array( 'Micromax', 'A84' ),
 			'Micromax A85'								=> array( 'Micromax', 'A85' ),
-			'Micromax A87'								=> array( 'Micromax', 'A87 Ninja 4' ),
+			'Micromax A87!'								=> array( 'Micromax', 'A87 Ninja 4' ),
+			'Micromax A89'								=> array( 'Micromax', 'A89 Ninja' ),
 			'Micromax A90!'								=> array( 'Micromax', 'A90 Pixel' ),
+			'A90S'										=> array( 'Micromax', 'A90S Pixel' ),
 			'Micromax A100'								=> array( 'Micromax', 'A100 Canvas' ),
 			'Micromax A110'								=> array( 'Micromax', 'A110 Canvas 2' ),
+			'Micromax Canvas 2'							=> array( 'Micromax', 'A110 Canvas 2' ),
+			'Micromax A110 (Canvas 2)'					=> array( 'Micromax', 'A110 Canvas 2' ),
+			'Micromax A116'								=> array( 'Micromax', 'A116 Canvas HD' ),
+			'Micromax P250(Funbook)'					=> array( 'Micromax', 'Funbook Alpha P250', TYPE_TABLET ),
 			'Micromax P275'								=> array( 'Micromax', 'Funbook Infinity P275', TYPE_TABLET ),
 			'P300(Funbook)'								=> array( 'Micromax', 'Funbook P300', TYPE_TABLET ),
 			'Micromax P350'								=> array( 'Micromax', 'Funbook P350', TYPE_TABLET ),
 			'Micromax P500(Funbook)'					=> array( 'Micromax', 'Funbook Pro P500', TYPE_TABLET ),
-			'Mobiistar Touch S01'						=> array( 'Mobiistar', 'Touch S01' ),	
-			'Cynus T1'									=> array( 'Mobistel', 'Cynus T1' ),				
+			'MioPad 6'									=> array( 'Mitac', 'MioPad 6', TYPE_TABLET ),
+			'MITO A200'									=> array( 'Mito', 'A200' ),
+			'MITO A322'									=> array( 'Mito', 'A322' ),
+			'Mobiistar Touch S01'						=> array( 'Mobiistar', 'Touch S01' ),
+			'Mobiistar Touch Kem 350'					=> array( 'Mobiistar', 'Touch Kem 350' ),
+			'edenTAB ET-701'							=> array( 'Mobile In Style', 'Eden TAB ET-701', TYPE_TABLET ),	
+			'Cynus T1'									=> array( 'Mobistel', 'Cynus T1' ),	
+			'Cynus T2'									=> array( 'Mobistel', 'Cynus T2' ),			
+			'MOGU M2'									=> array( 'Mogu', 'M2' ),				
+			'MOGU M2 ROM'								=> array( 'Mogu', 'M2' ),				
 			'AT735'										=> array( 'Moinstone', 'AT735', TYPE_TABLET ),
 			'A853'										=> array( 'Motorola', 'Milestone' ),
 			'A953'										=> array( 'Motorola', 'Milestone 2' ),
@@ -1278,6 +1759,7 @@ class DeviceModels {
 			'ME501'										=> array( 'Motorola', 'CLIQ XT' ),
 			'ME511'										=> array( 'Motorola', 'FLIPOUT' ),
 			'ME525!'									=> array( 'Motorola', 'MOTO ME525' ),
+			'ME526!'									=> array( 'Motorola', 'DEFY+' ),
 			'ME600'										=> array( 'Motorola', 'BACKFLIP' ),
 			'ME632'										=> array( 'Motorola', 'PRO+' ),
 			'ME722'										=> array( 'Motorola', 'Milestone 2' ),
@@ -1287,8 +1769,10 @@ class DeviceModels {
 			'ME865'										=> array( 'Motorola', 'ATRIX 2' ),
 			'MT620!'									=> array( 'Motorola', 'MOTO MT620' ),
 			'MT716'										=> array( 'Motorola', 'MOTO MT716' ),
+			'MT788'										=> array( 'Motorola', 'RAZR i' ),
 			'MT810'										=> array( 'Motorola', 'MOTO MT810' ),
 			'MT870'										=> array( 'Motorola', 'MOTO MT870' ),
+			'MT887'										=> array( 'Motorola', 'RAZR V' ),
 			'MT917'										=> array( 'Motorola', 'MT917' ),
 			'MZ505'										=> array( 'Motorola', 'XOOM Family Edition', TYPE_TABLET ),
 			'MZ600'										=> array( 'Motorola', 'XOOM 4G LTE', TYPE_TABLET ),
@@ -1299,16 +1783,20 @@ class DeviceModels {
 			'MZ605'										=> array( 'Motorola', 'XOOM 3G', TYPE_TABLET ),
 			'MZ606'										=> array( 'Motorola', 'XOOM WiFi', TYPE_TABLET ),
 			'MZ607'										=> array( 'Motorola', 'XOOM 2 WiFi Media Edition', TYPE_TABLET ),
+			'MZ608'										=> array( 'Motorola', 'XOOM 2 3G Media Edition', TYPE_TABLET ),
 			'MZ609!'									=> array( 'Motorola', 'Droid XYBOARD 8.2', TYPE_TABLET ),
 			'MZ615'										=> array( 'Motorola', 'XOOM 2 WiFi', TYPE_TABLET ),
+			'MZ616'										=> array( 'Motorola', 'XOOM 2 3G', TYPE_TABLET ),
 			'MZ617!'									=> array( 'Motorola', 'Droid XYBOARD 10.1', TYPE_TABLET ),
 			'WX435'										=> array( 'Motorola', 'TRIUMPH WX435' ),
 			'WX445'										=> array( 'Motorola', 'CITRUS WX445' ),
 			'XT300'										=> array( 'Motorola', 'SPICE' ),
 			'XT301'										=> array( 'Motorola', 'MOTO XT301' ),
 			'XT303'										=> array( 'Motorola', 'MOTOSMART XT303' ),
+			'XT305'										=> array( 'Motorola', 'MOTOSMART XT305' ),
 			'XT311'										=> array( 'Motorola', 'FIRE' ),
 			'XT316'										=> array( 'Motorola', 'MOTO XT316' ),
+			'XT317'										=> array( 'Motorola', 'SPICE Key' ),
 			'XT319'										=> array( 'Motorola', 'MOTO XT319' ),
 			'XT3(20|21)!'								=> array( 'Motorola', 'DEFY Mini' ),
 			'XT389'										=> array( 'Motorola', 'MOTOSMART XT389' ),
@@ -1322,9 +1810,11 @@ class DeviceModels {
 			'XT536'										=> array( 'Motorola', 'DEFY Diana' ),	
 			'XT550'										=> array( 'Motorola', 'MOTOSMART MIX' ),	
 			'XT5(56|57)!'								=> array( 'Motorola', 'DEFY XT' ),	
+			'XT560'										=> array( 'Motorola', 'DEFY Pro' ),	
 			'XT603'										=> array( 'Motorola', 'ADMIRAL' ),
 			'XT605'										=> array( 'Motorola', 'XT605' ),	
 			'XT610'										=> array( 'Motorola', 'Droid Pro' ),
+			'XT611'										=> array( 'Motorola', 'MOTOSMART Flip' ),
 			'XT615'										=> array( 'Motorola', 'MOTO XT615' ),
 			'XT626'										=> array( 'Motorola', 'MOTO XT626' ),
 			'XT681'										=> array( 'Motorola', 'MOTO XT681' ),
@@ -1335,6 +1825,7 @@ class DeviceModels {
 			'XT702'										=> array( 'Motorola', 'MOTO XT702' ),
 			'XT711'										=> array( 'Motorola', 'MOTO XT711' ),
 			'XT720'										=> array( 'Motorola', 'Milestone' ),
+			'XT760'										=> array( 'Motorola', 'MOTO XT760' ),
 			'XT788'										=> array( 'Motorola', 'XT788' ),
 			'XT875'										=> array( 'Motorola', 'Droid Bionic' ),
 			'XT800W'									=> array( 'Motorola', 'MOTO Glam' ),
@@ -1349,8 +1840,11 @@ class DeviceModels {
 			'XT890'										=> array( 'Motorola', 'RAZR i' ),
 			'XT8(94|97)!'								=> array( 'Motorola', 'Droid 4' ),
 			'XT9(01|10)!'								=> array( 'Motorola', 'RAZR' ),
+			'XT905'										=> array( 'Motorola', 'RAZR M' ),
 			'XT907'										=> array( 'Motorola', 'Droid RAZR M' ),
 			'XT912!'									=> array( 'Motorola', 'Droid RAZR' ),
+			'XT918'										=> array( 'Motorola', 'XT918' ),
+			'XT920'										=> array( 'Motorola', 'XT920' ),
 			'XT9(23|25|26)!'							=> array( 'Motorola', 'Droid RAZR HD' ),
 			'XT928'										=> array( 'Motorola', 'XT928' ),
 			'201M'										=> array( 'Motorola', 'Droid RAZR M' ),
@@ -1388,48 +1882,70 @@ class DeviceModels {
 			'MotoroiX'									=> array( 'Motorola', 'Droid X' ),
 			'Moto Backflip'								=> array( 'Motorola', 'BACKFLIP' ),
 			'RAZR'										=> array( 'Motorola', 'RAZR' ),
+			'RAZR HD'									=> array( 'Motorola', 'RAZR HD' ),
+			'RAZR MAXX'									=> array( 'Motorola', 'RAZR MAXX' ),
 			'Triumph'									=> array( 'Motorola', 'TRIUMPH' ),
 			'Opus One'									=> array( 'Motorola', 'i1' ),
 			'Photon'									=> array( 'Motorola', 'PHOTON' ),
 			'Photon 4G'									=> array( 'Motorola', 'PHOTON 4G' ),
 			'XOOM'										=> array( 'Motorola', 'XOOM', TYPE_TABLET ),
+			'MOTOROLA XOOM MZ606'						=> array( 'Motorola', 'XOOM', TYPE_TABLET ),
 			'XOOM 2!'									=> array( 'Motorola', 'XOOM 2', TYPE_TABLET ),
 			'XOOM MZ606'								=> array( 'Motorola', 'XOOM WiFi', TYPE_TABLET ),
 			'ISW11M'									=> array( 'Motorola', 'PHOTON' ),
 			'IS12M'										=> array( 'Motorola', 'RAZR' ),
+			'MOTOROLA RAZR'								=> array( 'Motorola', 'RAZR' ),
 			'MOTWX435KT'								=> array( 'Motorola', 'TRIUMPH' ),
 			'X3-Ice MIUI XT720 Memorila Classics'		=> array( 'Motorola', 'Milestone' ),
-			'Enjoy 7 Plus'								=> array( 'MSI', 'WindPad Enjoy 7 Plus', TYPE_TABLET ),
+			'MC40N0'									=> array( 'Motorola', 'MC40', TYPE_POS ),
+			'Enjoy 7 Plus'								=> array( 'Multilaser', 'Vibe NB036', TYPE_TABLET ),
+			'MTS-SP100'									=> array( 'MTS', 'Lifewire SP 100' ),
+			'NB036'										=> array( 'Nabi', 'Kids tablet', TYPE_TABLET ),
+			'MyPhone A848 Duo'							=> array( 'MyPhone', 'A848 Duo' ),
 			'A878 Duo'									=> array( 'MyPhone', 'A878 Duo' ),
+			'MyPhone A888 Duo'							=> array( 'MyPhone', 'A888 Duo' ),
 			'A898 Duo'									=> array( 'MyPhone', 'A898 Duo' ),
+			'MyPhone A919 Duo'							=> array( 'MyPhone', 'A919 Duo' ),
 			'NABI-A'									=> array( 'Nabi', 'Kids tablet', TYPE_TABLET ),
 			'N1'										=> array( 'Newman', 'N1' ),
+			'Newman N2'									=> array( 'Newman', 'N2' ),
 			'Newpad'									=> array( 'Newsmy', 'Newpad', TYPE_TABLET ),
 			'Newpad-K97'								=> array( 'Newsmy', 'Newpad K97', TYPE_TABLET ),
+			'P7'										=> array( 'Newsmy', 'Newpad P7', TYPE_TABLET ),
 			'Newpad P9'									=> array( 'Newsmy', 'Newpad P9', TYPE_TABLET ),
 			'M-PAD N8'									=> array( 'Newsmy', 'M-pad N8', TYPE_TABLET ),
 			'LT-NA7'									=> array( 'NEC', 'LT-NA7' ),
 			'N-01D'										=> array( 'NEC', 'MEDIAS PP N-01D' ),
 			'N-04C'										=> array( 'NEC', 'MEDIAS N-04C' ),
 			'N-04D'										=> array( 'NEC', 'MEDIAS LTE N-04D' ),
+			'N-04E'										=> array( 'NEC', 'MEDIAS X N-04E' ),
 			'N-05D'										=> array( 'NEC', 'MEDIAS ES N-05D' ),
 			'N-06C'										=> array( 'NEC', 'MEDIAS WP N-06C' ),
 			'N-06D'										=> array( 'NEC', 'MEDIAS Tab N-06D', TYPE_TABLET ),
 			'N-07D'										=> array( 'NEC', 'MEDIAS X N-07D' ),
 			'101N'										=> array( 'NEC', 'MEDIAS CH Softbank 101N' ),
 			'IS11N'										=> array( 'NEC', 'MEDIAS BR IS11N' ),
+			'NEC-101S'									=> array( 'NEC', 'MEDIAS 101S' ),
+			'NEC-101T'									=> array( 'NEC', 'MEDIAS 101T' ),
 			'Nexian NX-A890'							=> array( 'Nexian', 'Journey' ),
 			'NX-A890'									=> array( 'Nexian', 'Journey' ),
 			'NX-A891'									=> array( 'Nexian', 'Ultra Journey' ),
+			'NX-A899'									=> array( 'Nexian', 'Xtreme' ),
 			'M726HC'									=> array( 'Nextbook', 'Premium 7', TYPE_EREADER ),
 			'Next7P12!'									=> array( 'Nextbook', 'Premium 7', TYPE_EREADER ),
 			'NXM726HN'									=> array( 'Nextbook', 'Premium 7', TYPE_EREADER ),
 			'NXM727KC!'									=> array( 'Nextbook', 'Premium 7', TYPE_EREADER ),
 			'Next8P12'									=> array( 'Nextbook', 'Premium 8', TYPE_EREADER ),
+			'NXM803HC'									=> array( 'Nextbook', 'Premium 8', TYPE_EREADER ),
 			'NXM803HD'									=> array( 'Nextbook', 'Premium 8', TYPE_EREADER ),
 			'DATAM803HC'								=> array( 'Nextbook', 'Premium 8', TYPE_EREADER ),
+			'NXM805ND'									=> array( 'Nextbook', 'Premium 8 SE', TYPE_EREADER ),
+			'DATAM819HD B'								=> array( 'Nextbook', 'Premium 8', TYPE_EREADER ),
+			'NXM908HC'									=> array( 'Nextbook', 'Premium 9', TYPE_EREADER ),
+			'NXM703U'									=> array( 'Nextbook', 'Next 2', TYPE_EREADER ),
 			'NXM901'									=> array( 'Nextbook', 'Next 3', TYPE_EREADER),
 			'NGM Vanity Smart'							=> array( 'NGM', 'Vanity Smart' ),
+			'i9430'										=> array( 'Ninetology', 'Insight i9430' ),
 			'Nokia N9'									=> array( 'Nokia', 'N9' ),
 			'Nokia N900'								=> array( 'Nokia', 'N900' ),
 			'Lumia800'									=> array( 'Nokia', 'Lumia 800' ),
@@ -1438,10 +1954,13 @@ class DeviceModels {
 			'Adam'										=> array( 'Notion Ink', 'ADAM', TYPE_TABLET ),
 			'P4D Sirius'								=> array( 'Nvsbl', 'P4D SIRIUS', TYPE_TABLET ),
 			'EFM710A'									=> array( 'Oblio', 'Mint 7x', TYPE_TABLET ),
+			'Loox'										=> array( 'Odys', 'Loox', TYPE_TABLET ),
 			'ODYS-Xpress'								=> array( 'Odys', 'Xpress', TYPE_TABLET ),
 			'Olivetti Olipad 100'						=> array( 'Olivetti', 'Olipad 100', TYPE_TABLET ),
 			'OP110'										=> array( 'Olivetti', 'Olipad 110', TYPE_TABLET ),
 			'ONDA MID'									=> array( 'Onda', 'MID', TYPE_TABLET ),
+			'V812 Core4'								=> array( 'Onda', 'V812 Quad Core', TYPE_TABLET ),
+			'V972 Core4'								=> array( 'Onda', 'V972 Quad Core', TYPE_TABLET ),
 			'VX580A'									=> array( 'Onda', 'VX580A', TYPE_TABLET ),
 			'VX610A'									=> array( 'Onda', 'VX610A', TYPE_TABLET ),
 			'TQ150'										=> array( 'Onda', 'TQ150' ),
@@ -1453,20 +1972,26 @@ class DeviceModels {
 			'OPPOX905'									=> array( 'Oppo', 'Find 3 X905' ),
 			'X907'										=> array( 'Oppo', 'Finder X907' ),
 			'OPPOX907'									=> array( 'Oppo', 'Finder X907' ),
+			'X909'										=> array( 'Oppo', 'Find 5 X909' ),
 			'X9015'										=> array( 'Oppo', 'Find X9015' ),
 			'OPPOX9015'									=> array( 'Oppo', 'Find X9015' ),
+			'X9017'										=> array( 'Oppo', 'Finder X9017' ),
 			'OPPOX9017'									=> array( 'Oppo', 'Finder X9017' ),
 			'R801'										=> array( 'Oppo', 'Real R801' ),
 			'OPPOR801'									=> array( 'Oppo', 'Real R801' ),
+			'OPPOR803'									=> array( 'Oppo', 'Real R803' ),
 			'OPPOR805'									=> array( 'Oppo', 'Real R805' ),
+			'R807'										=> array( 'Oppo', 'Real R807' ),
 			'OPPOR807'									=> array( 'Oppo', 'Real R807' ),
 			'OPPOR817'									=> array( 'Oppo', 'Real R817' ),
 			'OPPOT29'									=> array( 'Oppo', 'T29' ),
-			'OPPOT703'									=> array( 'Oppo', 'T703' ),
+			'(OPPO-?)?T703!'							=> array( 'Oppo', 'T703' ),
 			'OPPOU701'									=> array( 'Oppo', 'Ulike U701' ),
 			'OPPOU7011'									=> array( 'Oppo', 'Find Gemini U7011' ),
+			'OP0118-12'									=> array( 'Oregon Scientific', 'Meep!', TYPE_TABLET ),
 			'P-01D'										=> array( 'Panasonic', 'P-01D' ),
 			'P-02D'										=> array( 'Panasonic', 'Lumix Phone' ),
+			'P-02E'										=> array( 'Panasonic', 'Eluga X' ),
 			'P-04D'										=> array( 'Panasonic', 'Eluga' ),
 			'P-06D'										=> array( 'Panasonic', 'Eluga V' ),
 			'P-07C'										=> array( 'Panasonic', 'P-07C' ),
@@ -1497,7 +2022,8 @@ class DeviceModels {
 			'IM-A830!'									=> array( 'Pantech', 'Vega Racer 2' ),
 			'IM-A840!'									=> array( 'Pantech', 'Vega S5' ),
 			'IM-A850!'									=> array( 'Pantech', 'Vega R3' ),
-			'IM-A860!'									=> array( 'Pantech', 'IM-A860' ),
+			'IM-A860!'									=> array( 'Pantech', 'Vega N˚ 6' ),
+			'IM-A870!'									=> array( 'Pantech', 'IM-A870' ),
 			'IM-T100K'									=> array( 'Pantech', 'Vega N˚ 5', TYPE_TABLET ),
 			'IS06'										=> array( 'Pantech', 'SIRIUS α' ),
 			'ADR8995!'									=> array( 'Pantech', 'Breakout' ),
@@ -1512,57 +2038,119 @@ class DeviceModels {
 			'SKY IM-A600S'								=> array( 'Pantech', 'SIRIUS α' ),
 			'SKY IM-A630K'								=> array( 'Pantech', 'Izar' ),
 			'SKY IM-A650S'								=> array( 'Pantech', 'Vega' ),
+			'PTL21'										=> array( 'Pantech', 'Vega PTL21' ),
 			'IS11PT'									=> array( 'Pantech', 'Mirach IS11PT' ),
+			'FC6100'									=> array( 'Parrot', 'FC6100', TYPE_CAR ),
+			'chagall'									=> array( 'Pegatron', 'Chagall', TYPE_TABLET ),
+			'7500IPS'									=> array( 'Perfeo', '7500IPS', TYPE_TABLET ),
 			'PAT712W'									=> array( 'Perfeo', 'PAT712W', TYPE_TABLET ),
 			'X7G'										=> array( 'Pearl', 'Touchlet X7G', TYPE_TABLET ),
 			'PP4MT-7'									=> array( 'Pendo', 'Pendopad 4', TYPE_TABLET ),
+			'Penta WS802C'								=> array( 'Penta', 'T-Pad WS802C', TYPE_TABLET ),
 			'FWS710EU'									=> array( 'Phicomm', 'FWS710' ),
 			'FWS810'									=> array( 'Phicomm', 'FWS810' ),
+			'PHICOMM-i700v'								=> array( 'Phicomm', 'i700v' ),
 			'Philips PI5000'							=> array( 'Philips', 'PI5000', TYPE_TABLET ),
 			'PI7000'									=> array( 'Philips', 'PI7000', TYPE_TABLET ),
+			'Philips W336'								=> array( 'Philips', 'W336' ),
 			'Philips W536'								=> array( 'Philips', 'W536' ),
 			'Philips W626'								=> array( 'Philips', 'W626' ),
+			'W626'										=> array( 'Philips', 'W626' ),
 			'Philips W632'								=> array( 'Philips', 'W632' ),
+			'Philips W832'								=> array( 'Philips', 'W832' ),
+			'PGM 398'									=> array( 'Pixcom', 'PGM 398' ),
+			'PLOYER-MOMO'								=> array( 'Ployer', 'MOMO', TYPE_TABLET ),
 			'MOMO'										=> array( 'Ployer', 'MOMO', TYPE_TABLET ),
 			'MOMO7'										=> array( 'Ployer', 'MOMO7', TYPE_TABLET ),
 			'MOMO7 Talent'								=> array( 'Ployer', 'MOMO7 Talent', TYPE_TABLET ),
 			'MOMO8'										=> array( 'Ployer', 'MOMO8', TYPE_TABLET ),
 			'MOMO9'										=> array( 'Ployer', 'MOMO9', TYPE_TABLET ),
 			'MOMO9 STAR'								=> array( 'Ployer', 'MOMO9 Star', TYPE_TABLET ),
+			'MOMO11 bird'								=> array( 'Ployer', 'MOMO11 Bird', TYPE_TABLET ),
 			'MOMO11Speed'								=> array( 'Ployer', 'MOMO11 Speed', TYPE_TABLET ),
 			'MOMO15'									=> array( 'Ployer', 'MOMO15', TYPE_TABLET ),
 			'PocketBook A7'								=> array( 'PocketBook', 'A7', TYPE_TABLET ),
 			'PocketBook A10'							=> array( 'PocketBook', 'A10', TYPE_TABLET ),
+			'PocketBook A10 3G'							=> array( 'PocketBook', 'A10 3G', TYPE_TABLET ),
+			'Obreey SURFpad'							=> array( 'PocketBook', 'SURFpad', TYPE_TABLET ),
 			'Mobii 7'									=> array( 'Point Of View', 'Mobii 7', TYPE_TABLET ),
-			'POV TAB-PROTAB30-IPS10'					=> array( 'Point Of View', 'ProTab 30', TYPE_TABLET ),
+			'POV-Mobii-7'								=> array( 'Point Of View', 'Mobii 7', TYPE_TABLET ),
+			'PlayTabPro'								=> array( 'Point Of View', 'PlayTabPro', TYPE_TABLET ),
+			'TAB-PLAYTABPRO'							=> array( 'Point Of View', 'PlayTabPro', TYPE_TABLET ),
+			'POV TAB-PROTAB25!'							=> array( 'Point Of View', 'ProTab 25', TYPE_TABLET ),
+			'POV TAB-PROTAB26!'							=> array( 'Point Of View', 'ProTab 26', TYPE_TABLET ),
+			'POV TAB-PROTAB30!'							=> array( 'Point Of View', 'ProTab 30', TYPE_TABLET ),
+			'TAB-PROTAB2XXL(4)'							=> array( 'Point Of View', 'ProTab2 XXL', TYPE_TABLET ),
+			'POV TAB NAVI7 3G M'						=> array( 'Point Of View', 'Onyx 507', TYPE_TABLET ),
+			'POV TV-HDMI-200BT'							=> array( 'Point Of View', 'Smart TV', TYPE_TELEVISION ),
+			'POV TV-HDMI-KB-01'							=> array( 'Point Of View', 'Smart TV', TYPE_TELEVISION ),
 			'MIDC409'									=> array( 'Polaroid', 'Diamond III', TYPE_TABLET ),
 			'PMID4311'									=> array( 'Polaroid', 'PMID 4311', TYPE_TABLET ),
 			'PMID701C'									=> array( 'Polaroid', 'PMID 701c', TYPE_TABLET ),
+			'POLY PAD 9708HD'							=> array( 'Polypad', '9708 HD', TYPE_TABLET ),
 			'POLY PAD 9716HD'							=> array( 'Polypad', '9716 HD', TYPE_TABLET ),
+			'Polypad C508'								=> array( 'Polypad', 'C508', TYPE_TABLET ),
+			'POLYTRON W2430'							=> array( 'Polytron', 'W2430 Wizard Twins' ),
+			'POLYTRON W2500'							=> array( 'Polytron', 'W2500 Wizard Twins' ),
+			'POLYTRON W3430'							=> array( 'Polytron', 'W3430 Wizard Crystal' ),
 			'ACT2000'									=> array( 'Poptronix', 'ACT2000', TYPE_TABLET ),
+			'PMP3084B'									=> array( 'Prestigio', 'Multipad 3084', TYPE_TABLET ),
+			'PMP3170B'									=> array( 'Prestigio', 'Multipad 3170 Pro', TYPE_TABLET ),
+			'PMP3170BEN'								=> array( 'Prestigio', 'Multipad 3170 Pro', TYPE_TABLET ),
+			'PMP3270B'									=> array( 'Prestigio', 'Multipad 3270 Prime', TYPE_TABLET ),
+			'PMP3370B'									=> array( 'Prestigio', 'Multipad 3370', TYPE_TABLET ),
 			'PMP3384BRU'								=> array( 'Prestigio', 'Multipad 3384', TYPE_TABLET ),
+			'PMP3770B'									=> array( 'Prestigio', 'Multipad 3770', TYPE_TABLET ),
+			'PMP5080B'									=> array( 'Prestigio', 'Multipad 5080', TYPE_TABLET ),
 			'PMP5080CPRO'								=> array( 'Prestigio', 'Multipad 5080 Pro', TYPE_TABLET ),
+			'PMP5097CPRO'								=> array( 'Prestigio', 'Multipad 5097 Pro', TYPE_TABLET ),
+			'PMP5197DULTRA'								=> array( 'Prestigio', 'Multipad 5197 Ultra', TYPE_TABLET ),
+			'PMP5570C'									=> array( 'Prestigio', 'Multipad 5570 Pro', TYPE_TABLET ),	
+			'PMP5580C'									=> array( 'Prestigio', 'Multipad 5580 Prime', TYPE_TABLET ),
+			'PMP5597D'									=> array( 'Prestigio', 'Multipad 5597 Ultra Duo', TYPE_TABLET ),
+			'PMP5770D'									=> array( 'Prestigio', 'Multipad 5770 Pro', TYPE_TABLET ),
+			'PMP5880D'									=> array( 'Prestigio', 'Multipad 5880 Ultra Duo', TYPE_TABLET ),
+			'PMP7100D3G'								=> array( 'Prestigio', 'Multipad 7100 Ultimate 3G', TYPE_TABLET ),
+			'PAP3500 DUO'								=> array( 'Prestigio', 'Multiphone 3500 Duo' ),
+			'PAP4040 DUO'								=> array( 'Prestigio', 'Multiphone 4040 Duo' ),
+			'PAP4300 DUO'								=> array( 'Prestigio', 'Multiphone 4300 Duo' ),
+			'PAP4500DUO'								=> array( 'Prestigio', 'Multiphone 4500 Duo' ),
+			'PAP4500TDUO'								=> array( 'Prestigio', 'Multiphone 4500 Duo' ),
+			'PAP5000TDUO'								=> array( 'Prestigio', 'Multiphone 5000 Duo' ),
+			'MD-0696B'									=> array( 'Prolink', 'MD-0696B', TYPE_TABLET ),
 			'TB07FTA'									=> array( 'Positivo', 'TB07FTA', TYPE_TABLET ),
 			'QW TB-1207'								=> array( 'Qware', 'Pro3', TYPE_TABLET ),
 			'W6'										=> array( 'Ramos', 'W6', TYPE_TABLET ),
 			'W6HD ICS'									=> array( 'Ramos', 'W6HD', TYPE_TABLET ),
 			'W10'										=> array( 'Ramos', 'W10', TYPE_TABLET ),
 			'W10 V2.0'									=> array( 'Ramos', 'W10 v2.0', TYPE_TABLET ),
+			'Ramos W12HD'								=> array( 'Ramos', 'W12HD', TYPE_TABLET ),
 			'W17PRO(Dualcore)'							=> array( 'Ramos', 'W17 Pro Dual Core', TYPE_TABLET ),
 			'W22PRO'									=> array( 'Ramos', 'W22 Pro', TYPE_TABLET ),
+			'W22PRO 3G'									=> array( 'Ramos', 'W22 Pro 3G', TYPE_TABLET ),
+			'Ramos W27Pro'								=> array( 'Ramos', 'W27 Pro', TYPE_TABLET ),
 			'W28(Dualcore)'								=> array( 'Ramos', 'W28 Dual Core', TYPE_TABLET ),
+			'W30(QuadCore)'								=> array( 'Ramos', 'W30 Quad Core', TYPE_TABLET ),
+			'w30hd(QuadCore)'							=> array( 'Ramos', 'W30HD Quad Core', TYPE_TABLET ),
+			'w42(QuadCore)'								=> array( 'Ramos', 'W42 Quad Core', TYPE_TABLET ),
 			'T11AD!'									=> array( 'Ramos', 'T11AD', TYPE_TABLET ),
 			'Readboy G12'								=> array( 'Readboy', 'G12', TYPE_TABLET ),
-			'Rikomagic MK802'							=> array( 'Rikomagic', 'MK802', TYPE_TELEVISION ),
 			'PlayBook'									=> array( 'RIM', 'BlackBerry PlayBook', TYPE_TABLET ),
 			'RBK-490'									=> array( 'Ritmix', 'RBK-490', TYPE_TABLET ),
+			'RMD-755'									=> array( 'Ritmix', 'RBK-755', TYPE_TABLET ),
+			'RMD-1030'									=> array( 'Ritmix', 'RBK-1030', TYPE_TABLET ),
+			'RMD-73G'									=> array( 'Ross&Moor', 'RMD-73G', TYPE_TABLET ),	
+			'RMD-973G'									=> array( 'Ross&Moor', 'RMD-973G', TYPE_TABLET ),
+			'RoverPad 3W T71D'							=> array( 'RoverPad', '3W T71D', TYPE_TABLET ),
 			'A8HD'										=> array( 'Saayi', 'Dropad A8HD', TYPE_TABLET ),
 			'EK-GC100'									=> array( 'Samsung', 'Galaxy Camera', TYPE_CAMERA ),
+			'EK-GC110'									=> array( 'Samsung', 'Galaxy Camera', TYPE_CAMERA ),
 			'GT-B5330!'									=> array( 'Samsung', 'Galaxy Chat' ),
 			'GT-B5510!'									=> array( 'Samsung', 'Galaxy Y Pro' ),
 			'GT-B5512!'									=> array( 'Samsung', 'Galaxy Y Pro Duos' ),
 			'GT-B7510!'									=> array( 'Samsung', 'Galaxy Pro' ),
 			'GT-B9062'									=> array( 'Samsung', 'GT-B9062' ),
+			'GT-B9150'									=> array( 'Samsung', 'Galaxy "Q"' ),
 			'GT-I55(00|03|08)!'							=> array( 'Samsung', 'Galaxy 5' ),
 			'GT-I5510!'									=> array( 'Samsung', 'Galaxy 551' ),
 			'GT-I5700!'									=> array( 'Samsung', 'Galaxy Spica' ),
@@ -1573,24 +2161,34 @@ class DeviceModels {
 			'GT-I8150!'									=> array( 'Samsung', 'Galaxy W' ),
 			'GT-I8160!'									=> array( 'Samsung', 'Galaxy Ace 2' ),
 			'GT-I8190!'									=> array( 'Samsung', 'Galaxy S III Mini' ),
+			'GT-I8240!'									=> array( 'Samsung', 'GT-I8240' ),	
+			'GT-I8245!'									=> array( 'Samsung', 'GT-I8245' ),			
 			'GT-I8250!'									=> array( 'Samsung', 'GT-I8250' ),
+			'GT-I8262!'									=> array( 'Samsung', 'Galaxy Core' ),
 			'GT-I8320!'									=> array( 'Samsung', 'H1' ),
 			'GT-I85(20|30)!'							=> array( 'Samsung', 'Galaxy Beam' ),
-			'GT-I8730!'									=> array( 'Samsung', 'Express' ),							
+			'GT-I8730!'									=> array( 'Samsung', 'Galaxy Express' ),							
 			'GT-I90(00|08|18|88)!'						=> array( 'Samsung', 'Galaxy S' ),
 			'GT-I9001!'									=> array( 'Samsung', 'Galaxy S Plus' ),
 			'GT-I9003!'									=> array( 'Samsung', 'Galaxy SL' ),
 			'GT-I9010!'									=> array( 'Samsung', 'Galaxy S Giorgio Armani' ),
 			'GT-I9050!'									=> array( 'Samsung', 'GT-I9050' ),
 			'GT-I9070!'									=> array( 'Samsung', 'Galaxy S Advance' ),
+			'GT-I9082!'									=> array( 'Samsung', 'Galaxy Grand Duos' ),
 			'GT-I91(00|08)!'							=> array( 'Samsung', 'Galaxy S II' ),
 			'GT-I9103!'									=> array( 'Samsung', 'Galaxy R' ),
+			'GT-I9105!'									=> array( 'Samsung', 'Galaxy S II Plus' ),
+			'GT-I9150!'									=> array( 'Samsung', 'Galaxy "Fonblet 5.8"' ),
+			'GT-I9152!'									=> array( 'Samsung', 'Galaxy "Fonblet 5.8" Duos' ),
+			'GT-I9190!'									=> array( 'Samsung', 'Galaxy S4 Mini' ),
+			'GT-I9200!'									=> array( 'Samsung', 'Galaxy S II' ),
+			'GT-I9205'									=> array( 'Samsung', 'Galaxy "Fonblet 6.3"' ),
 			'GT-I9210!'									=> array( 'Samsung', 'Galaxy S II LTE' ),
 			'GT-I92(20|28)!'							=> array( 'Samsung', 'Galaxy Note' ),
 			'GT-I9250!'									=> array( 'Samsung', 'Galaxy Nexus' ),
-			'GT-I9260'									=> array( 'Samsung', 'Galaxy Premier' ),
+			'GT-I92(60|68)!'							=> array( 'Samsung', 'Galaxy Premier' ),
 			'GT-I93(00|03|05|08)!'						=> array( 'Samsung', 'Galaxy S III' ),
-			'GT-I95(00|05)!'							=> array( 'Samsung', 'Galaxy S IV' ),
+			'GT-I95(00|05)!'							=> array( 'Samsung', 'Galaxy S4' ),
 			'GT-I9800!'									=> array( 'Samsung', 'GT-I9800' ),
 			'GT-N5100'									=> array( 'Samsung', 'Galaxy Note 8.0', TYPE_TABLET ),
 			'GT-N70(00|05)!'							=> array( 'Samsung', 'Galaxy Note' ),
@@ -1610,8 +2208,11 @@ class DeviceModels {
 			'GT-P75(01|11)!'							=> array( 'Samsung', 'Galaxy Tab 10.1N', TYPE_TABLET ),
 			'GT-P8110!'									=> array( 'Samsung', 'Nexus 10', TYPE_TABLET ),
 			'GT-P8200!'									=> array( 'Samsung', 'Galaxy Tab "Roma"', TYPE_TABLET ),
+			'GT-S5282!'									=> array( 'Samsung', 'Galaxy Star' ),
 			'GT-S5300!'									=> array( 'Samsung', 'Galaxy Pocket' ),
 			'GT-S5302!'									=> array( 'Samsung', 'Galaxy Pocket Duos' ),
+			'GT-S5310!'									=> array( 'Samsung', 'Galaxy Pocket 2' ),
+			'GT-S5312!'									=> array( 'Samsung', 'Galaxy Pocket 2 Duos' ),
 			'GT-S53(60|63|69)!'							=> array( 'Samsung', 'Galaxy Y' ),
 			'GT-S5367!'									=> array( 'Samsung', 'Galaxy Y TV' ),
 			'GT-S5368!'									=> array( 'Samsung', 'GT-S5368' ),
@@ -1623,15 +2224,22 @@ class DeviceModels {
 			'GT-S6010'									=> array( 'Samsung', 'Galaxy Music' ),
 			'GT-S6012!'									=> array( 'Samsung', 'Galaxy Music Duos' ),
 			'GT-S6102!'									=> array( 'Samsung', 'Galaxy Y Duos' ),
-			'GT-S6352'									=> array( 'Samsung', 'Galaxy Ace Duos' ),
-			'GT-S6358'									=> array( 'Samsung', 'Galaxy Ace' ),
+			'GT-S6310!'									=> array( 'Samsung', 'Galaxy Young' ),
+			'GT-S6312!'									=> array( 'Samsung', 'Galaxy Young Duos' ),
+			'GT-S6352!'									=> array( 'Samsung', 'Galaxy Ace Duos' ),
+			'GT-S6358!'									=> array( 'Samsung', 'Galaxy Ace' ),
 			'GT-S6500!'									=> array( 'Samsung', 'Galaxy Mini 2' ),
 			'GT-S6702!'									=> array( 'Samsung', 'Galaxy Y Duos' ),
 			'GT-S6802!'									=> array( 'Samsung', 'Galaxy Ace Duos' ),
-			'GT-S7500!'									=> array( 'Samsung', 'Galaxy Ace Plus' ),
+			'GT-S6810!'									=> array( 'Samsung', 'Galaxy Frame' ),
+			'GT-S75(00|08)!'							=> array( 'Samsung', 'Galaxy Ace Plus' ),
 			'GT-S7560!'									=> array( 'Samsung', 'Galaxy Ace II x' ),
-			'GT-S7562!'									=> array( 'Samsung', 'Galaxy S Duos' ),
+			'GT-S75(62|68)!'							=> array( 'Samsung', 'Galaxy S Duos' ),
+			'GT-S7572!'									=> array( 'Samsung', 'GT-S7572' ),
 			'GT-S7710!'									=> array( 'Samsung', 'Galaxy Xcover 2' ),
+			'GT-S8500'									=> array( 'Samsung', 'Wave' ),
+			'GT-S8530'									=> array( 'Samsung', 'Wave II' ),
+			'GT-S9081'									=> array( 'Samsung', 'GT-S9081' ),
 			'GT-T959!'									=> array( 'Samsung', 'Galaxy S Vibrant' ),
 			'SCH-i509'									=> array( 'Samsung', 'Galaxy Y' ),
 			'SCH-i559'									=> array( 'Samsung', 'Galaxy Pop' ),
@@ -1651,6 +2259,7 @@ class DeviceModels {
 			'SCH-I400'									=> array( 'Samsung', 'Continuum' ),
 			'SCH-I405( 4G)?$!'							=> array( 'Samsung', 'Stratosphere' ),
 			'SCH-I405U'									=> array( 'Samsung', 'Galaxy Metrix' ),
+			'SCH-I415( 4G)?$!'							=> array( 'Samsung', 'Stratosphere II' ),
 			'SCH-I500'									=> array( 'Samsung', 'Fascinate' ),
 			'SCH-I510'									=> array( 'Samsung', 'Stealth V' ),
 			'SCH-I510 4G'								=> array( 'Samsung', 'Droid Charge' ),
@@ -1660,14 +2269,19 @@ class DeviceModels {
 			'SCH-I619'									=> array( 'Samsung', 'SCH-I619' ),
 			'SCH-I659'									=> array( 'Samsung', 'Galaxy Ace Plus' ),
 			'SCH-I699'									=> array( 'Samsung', 'Galaxy Trend' ),
+			'SCH-I739'									=> array( 'Samsung', 'SCH-I739' ),
 			'SCH-I779'									=> array( 'Samsung', 'SCH-I779' ),
 			'SCH-I800'									=> array( 'Samsung', 'Galaxy Tab 7.0', TYPE_TABLET ),
 			'SCH-I815!'									=> array( 'Samsung', 'Galaxy Tab 7.7', TYPE_TABLET ),
+			'SCH-I829'									=> array( 'Samsung', 'SCH-I829' ),
+			'SCH-I879'									=> array( 'Samsung', 'Captivate' ),
 			'SCH-I905!'									=> array( 'Samsung', 'Galaxy Tab 10.1', TYPE_TABLET ),
 			'SCH-I909'									=> array( 'Samsung', 'Galaxy S' ),
 			'SCH-I915!'									=> array( 'Samsung', 'Galaxy Tab 2 (10.1)', TYPE_TABLET ),
+			'SCH-I919!'									=> array( 'Samsung', 'SCH-I919' ),
 			'SCH-I925!'									=> array( 'Samsung', 'Galaxy Note 10.1', TYPE_TABLET ),
-			'SCH-I939'									=> array( 'Samsung', 'Galaxy S III' ),
+			'SCH-I939!'									=> array( 'Samsung', 'Galaxy S III' ),
+			'SCH-I959'									=> array( 'Samsung', 'Galaxy S4' ),
 			'SCH-L710'									=> array( 'Samsung', 'Galaxy S III' ),
 			'SCH-M828!'									=> array( 'Samsung', 'Galaxy Precedent' ),
 			'SCH-N719'									=> array( 'Samsung', 'Galaxy Note II' ),
@@ -1676,8 +2290,10 @@ class DeviceModels {
 			'SCH-R680'									=> array( 'Samsung', 'Repp' ),
 			'SCH-R720'									=> array( 'Samsung', 'Admire' ),
 			'SCH-R730'									=> array( 'Samsung', 'Transfix' ),
+			'SCH-R740!'									=> array( 'Samsung', 'SCH-R740' ),
 			'SCH-R760'									=> array( 'Samsung', 'Galaxy S II' ),
 			'SCH-R820'									=> array( 'Samsung', 'Admire' ),
+			'SCH-R830!'									=> array( 'Samsung', 'Axiom' ),
 			'SCH-R880'									=> array( 'Samsung', 'Acclaim' ),
 			'SCH-R910'									=> array( 'Samsung', 'Galaxy Indulge 4G' ),
 			'SCH-R915'									=> array( 'Samsung', 'Galaxy Indulge' ),
@@ -1685,23 +2301,29 @@ class DeviceModels {
 			'SCH-R930'									=> array( 'Samsung', 'Galaxy S Aviator' ),
 			'SCH-R940'									=> array( 'Samsung', 'Galaxy S Lightray' ),
 			'SCH-R950'									=> array( 'Samsung', 'Galaxy Note II' ),
+			'SCH-R970C'									=> array( 'Samsung', 'SCH-R970C' ),
 			'SCH-S720C'									=> array( 'Samsung', 'Galaxy Proclaim' ),
 			'SCH-S735C'									=> array( 'Samsung', 'SCH-S735' ),
 			'SCH-S950C'									=> array( 'Samsung', 'Galaxy S Showcase' ),
+			'SCH-V727'									=> array( 'Samsung', 'Galaxy S4' ),
 			'SCH-W799!'									=> array( 'Samsung', 'SCH-W799' ),
 			'SCH-W899'									=> array( 'Samsung', 'SCH-W899' ),
 			'SCH-W999'									=> array( 'Samsung', 'SCH-W999' ),
+			'SCH-W2013'									=> array( 'Samsung', 'SCH-W2013' ),
 			'SGH-E258'									=> array( 'Samsung', 'SGH-E258' ),
 			'SGH-I317!'									=> array( 'Samsung', 'Galaxy Note II' ),
-			'SGH-I337!'									=> array( 'Samsung', 'Galaxy S IV' ),
+			'SGH-I337!'									=> array( 'Samsung', 'Galaxy S4' ),
+			'SGH-I437!'									=> array( 'Samsung', 'Galaxy Express' ),
 			'SGH-I497'									=> array( 'Samsung', 'Galaxy Tab 2 (10.1)', TYPE_TABLET ),
 			'SGH-I547!'									=> array( 'Samsung', 'Galaxy Rugby Pro' ),
+			'SGH-I577!'									=> array( 'Samsung', 'Galaxy Exhilarate' ),	
 			'SGH-I717!'									=> array( 'Samsung', 'Galaxy Note' ),
 			'SGH-I727'									=> array( 'Samsung', 'Galaxy S II Skyrocket' ),
 			'SGH-I727R'									=> array( 'Samsung', 'Galaxy S II' ),
 			'SGH-I7(47|48)!'							=> array( 'Samsung', 'Galaxy S III' ),
 			'SGH-I757!'									=> array( 'Samsung', 'Galaxy S II Skyrocket HD' ),
 			'SGH-I9?777!'								=> array( 'Samsung', 'Galaxy S II' ),
+			'SGH-I827D'									=> array( 'Samsung', 'Galaxy Ace Q' ),
 			'SGH-I847'									=> array( 'Samsung', 'Rugby Smart' ),
 			'SGH-I8(96|97)!'							=> array( 'Samsung', 'Captivate' ),
 			'SGH-I927!'									=> array( 'Samsung', 'Captivate Glide' ),
@@ -1716,6 +2338,7 @@ class DeviceModels {
 			'SGH-T499'									=> array( 'Samsung', 'Dart' ),
 			'SGH-T499[VY]!'								=> array( 'Samsung', 'Galaxy Mini' ),
 			'SGH-T589!'									=> array( 'Samsung', 'Gravity Smart' ),
+			'SGH-T599!'									=> array( 'Samsung', 'Exhibit' ),	
 			'SGH-T679!'									=> array( 'Samsung', 'Exhibit II 4G' ),
 			'SGH-T699'									=> array( 'Samsung', 'S Blaze Q' ),
 			'SGH-T759'									=> array( 'Samsung', 'Exhibit 4G' ),
@@ -1731,6 +2354,7 @@ class DeviceModels {
 			'SGH-T959D'									=> array( 'Samsung', 'Galaxy S Fascinate 3G+' ),
 			'SGH-T959P'									=> array( 'Samsung', 'Galaxy S Fascinate 4G' ),
 			'SGH-T959V'									=> array( 'Samsung', 'Galaxy S 4G' ),
+			'SGH-T959W'									=> array( 'Samsung', 'Galaxy S 4G' ),
 			'SGH-T989'									=> array( 'Samsung', 'Galaxy S II' ),
 			'SGH-T989D'									=> array( 'Samsung', 'Galaxy S II X' ),
 			'SGH-T999!'									=> array( 'Samsung', 'Galaxy S Blaze 4G' ),
@@ -1741,9 +2365,11 @@ class DeviceModels {
 			'SHV-E160!'									=> array( 'Samsung', 'Galaxy Note' ),
 			'SHV-E170!'									=> array( 'Samsung', 'Galaxy R' ),
 			'SHV-E210!'									=> array( 'Samsung', 'Galaxy S III' ),
+			'SHV-E220!'									=> array( 'Samsung', 'Galaxy Pop' ),
+			'SHV-E230!'									=> array( 'Samsung', 'Galaxy Note 10.1' ),
 			'SHV-E250!'									=> array( 'Samsung', 'Galaxy Note II' ),
 			'SHV-E270!'									=> array( 'Samsung', 'Galaxy Grand' ),
-			'SHV-E300!'									=> array( 'Samsung', 'Galaxy S IV' ),
+			'SHV-E300!'									=> array( 'Samsung', 'Galaxy S4' ),
 			'SHW-M100!'									=> array( 'Samsung', 'Galaxy A' ),
 			'SHW-M110!'									=> array( 'Samsung', 'Galaxy S' ),
 			'SHW-M130L!'								=> array( 'Samsung', 'Galaxy U' ),
@@ -1759,7 +2385,7 @@ class DeviceModels {
 			'SHW-M340!'									=> array( 'Samsung', 'Galaxy M Style' ),
 			'SHW-M380!'									=> array( 'Samsung', 'Galaxy Tab 10.1', TYPE_TABLET ),
 			'SHW-M440!'									=> array( 'Samsung', 'Galaxy S III' ),
-			'SHW-M480!'									=> array( 'Samsung', 'Galaxy Note 10.1' ),
+			'SHW-M4(80|85)!'							=> array( 'Samsung', 'Galaxy Note 10.1' ),
 			'SMT-i9100'									=> array( 'Samsung', 'SMT-I9100', TYPE_TABLET ),
 			'SPH-D600'									=> array( 'Samsung', 'Conquer 4G' ),
 			'SPH-D700'									=> array( 'Samsung', 'Epic 4G' ),
@@ -1771,16 +2397,18 @@ class DeviceModels {
 			'SPH-L900'									=> array( 'Samsung', 'Galaxy Note II' ),
 			'SPH-M820!'									=> array( 'Samsung', 'Galaxy Prevail' ),
 			'SPH-M830'									=> array( 'Samsung', 'Galaxy Rush' ),
-			'SPH-M580'									=> array( 'Samsung', 'Replenish' ),
+			'SPH-M580!'									=> array( 'Samsung', 'Replenish' ),
 			'SPH-M900'									=> array( 'Samsung', 'Moment' ),
 			'SPH-M910'									=> array( 'Samsung', 'Intercept' ),
 			'SPH-M920'									=> array( 'Samsung', 'Transform' ),
 			'SPH-M930!'									=> array( 'Samsung', 'Transform Ultra' ),
 			'SPH-M950'									=> array( 'Samsung', 'Galaxy Reverb' ),
 			'SPH-P100'									=> array( 'Samsung', 'Galaxy Tab', TYPE_TABLET ),
+			'SPH-P500'									=> array( 'Samsung', 'Galaxy Tab 2 10.1', TYPE_TABLET ),
 			'YP-GB1'									=> array( 'Samsung', 'Galaxy Player', 'media' ),
 			'YP-GB70'									=> array( 'Samsung', 'Galaxy Player 70', 'media' ),
 			'YP-GB70D'									=> array( 'Samsung', 'Galaxy Player 70 Plus', 'media' ),
+			'YP-GP1'									=> array( 'Samsung', 'Galaxy Player 5.8', 'media' ),
 			'YP-GS1'									=> array( 'Samsung', 'Galaxy S WiFi 3.6', 'media' ),
 			'YP-G1'										=> array( 'Samsung', 'Galaxy S WiFi 4.0', 'media' ),
 			'YP-GI1'									=> array( 'Samsung', 'Galaxy S WiFi 4.2', 'media' ),
@@ -1793,11 +2421,18 @@ class DeviceModels {
 			'T959'										=> array( 'Samsung', 'Galaxy S Vibrant' ),
 			'Captivate-I897'							=> array( 'Samsung', 'Captivate' ),
 			'Galaxy'									=> array( 'Samsung', 'Galaxy' ),
+			'Galaxy ACE'								=> array( 'Samsung', 'Galaxy Ace' ),
+			'Galaxy Mini'								=> array( 'Samsung', 'Galaxy Mini' ),
+			'Galaxy Mini Plus 4G'						=> array( 'Samsung', 'Galaxy Mini Plus' ),
 			'Galaxy Note'								=> array( 'Samsung', 'Galaxy Note' ),
+			'Galaxy Note II'							=> array( 'Samsung', 'Galaxy Note II' ),
 			'GalaxyS'									=> array( 'Samsung', 'Galaxy S' ),
 			'Galaxy S II'								=> array( 'Samsung', 'Galaxy S II' ),
+			'Galaxy S III'								=> array( 'Samsung', 'Galaxy S III' ),
 			'Galaxy X'									=> array( 'Samsung', 'Galaxy X' ),
 			'Galaxy Spica'								=> array( 'Samsung', 'Galaxy Spica' ),
+			'Galaxy pop plus 4G'						=> array( 'Samsung', 'Galaxy Pop Plus' ),
+			'Galaxy Precedent'							=> array( 'Samsung', 'Galaxy Precedent' ),
 			'GALAXY Tab'								=> array( 'Samsung', 'Galaxy Tab', TYPE_TABLET ),
 			'Vibrantmtd'								=> array( 'Samsung', 'Vibrant' ),
 			'Vibrant T959'								=> array( 'Samsung', 'Vibrant' ),
@@ -1813,7 +2448,9 @@ class DeviceModels {
 			'SC-04D'									=> array( 'Samsung', 'Galaxy Nexus' ),
 			'SC-05D'									=> array( 'Samsung', 'Galaxy Note LTE' ),
 			'SC-06D'									=> array( 'Samsung', 'Galaxy S III' ),
+			'SCL21'										=> array( 'Samsung', 'Galaxy S III Progre' ),
 			'ISW11SC'									=> array( 'Samsung', 'Galaxy S II WiMAX' ),
+			'Bambook S1'								=> array( 'Shanda', 'Bambook S1', TYPE_TABLET ),
 			'A01SH'										=> array( 'Sharp', 'A01SH' ),
 			'IS01'										=> array( 'Sharp', 'IS01' ),
 			'IS03'										=> array( 'Sharp', 'IS03' ),
@@ -1823,6 +2460,7 @@ class DeviceModels {
 			'IS13SH'									=> array( 'Sharp', 'Aquos IS13SH' ),
 			'IS14SH'									=> array( 'Sharp', 'Aquos IS14SH' ),
 			'ISW16SH'									=> array( 'Sharp', 'Aquos ISW16SH' ),
+			'IS17SH'									=> array( 'Sharp', 'Aquos CL IS17SH' ),
 			'EB-W51GJ'									=> array( 'Sharp', 'EB-W51GJ' ),
 			'SBM003SH'									=> array( 'Sharp', 'Galapagos' ),
 			'SBM005SH'									=> array( 'Sharp', 'Galapagos' ),
@@ -1837,6 +2475,7 @@ class DeviceModels {
 			'SBM107SH'									=> array( 'Sharp', 'Aquos 107SH' ),
 			'SBM107SHB'									=> array( 'Sharp', 'Aquos 107SH' ),
 			'SBM200SH'									=> array( 'Sharp', 'PANTONE 6 200SH' ),
+			'SBM203SH'									=> array( 'Sharp', 'Aquos Xx 203SH' ),
 			'SH-01D'									=> array( 'Sharp', 'Aquos SH-01D' ),
 			'SH-01E'									=> array( 'Sharp', 'Aquos si SH-01E' ),
 			'SH-02D'									=> array( 'Sharp', 'Aquos slider SH-02D' ),
@@ -1854,34 +2493,50 @@ class DeviceModels {
 			'SH80F'										=> array( 'Sharp', 'Aquos SH80F' ),
 			'SH530U'									=> array( 'Sharp', 'SH530U' ),
 			'SH-631M'									=> array( 'Sharp', 'SH631M' ),
+			'SH631W'									=> array( 'Sharp', 'SH631W' ),
+			'SH837W'									=> array( 'Sharp', 'SH837W' ),
+			'SH930W'									=> array( 'Sharp', 'SH930W' ),
 			'SH72x8U'									=> array( 'Sharp', 'SH72x8U' ),
 			'SH8118U'									=> array( 'Sharp', 'SH8118U' ),
 			'SH8128U'									=> array( 'Sharp', 'SH8128U' ),
 			'SH8158U'									=> array( 'Sharp', 'SH8158U' ),
+			'SH8168U'									=> array( 'Sharp', 'SH8168U' ),
 			'SH8188U'									=> array( 'Sharp', 'SH8188U' ),
 			'SH8268U'									=> array( 'Sharp', 'SH8268U' ),
+			'SHL21'										=> array( 'Sharp', 'Aquos Serie SHL21' ),
+			'SHT21'										=> array( 'Sharp', 'Aquos Pad SHT21', TYPE_TABLET ),
 			'INFOBAR C01'								=> array( 'Sharp', 'INFOBAR C01' ),
 			'SPX-5'										=> array( 'Simvalley', 'SPX-5' ),
 			'SPX-5 3G'									=> array( 'Simvalley', 'SPX-5 3G' ),
+			'SPX-12'									=> array( 'Simvalley', 'SPX-12' ),
+			'Skyworth PE90'								=> array( 'Skyworth', 'PE90' ),
+			'Andromax U'								=> array( 'Smartfren', 'Andromax U' ),
+			'Smartfren Tab 7'							=> array( 'Smartfren', 'Tab 7' ),
 			'SmartQ G7'									=> array( 'SmartQ', 'G7', TYPE_TABLET ),
 			'SmartQT7'									=> array( 'SmartQ', 'T7', TYPE_TABLET ),
 			'SmartQT10'									=> array( 'SmartQ', 'T10', TYPE_TABLET ),
 			'SmartQT15'									=> array( 'SmartQ', 'T15', TYPE_TABLET ),
 			'SmartQT19'									=> array( 'SmartQ', 'T19', TYPE_TABLET ),
 			'SmartQT20'									=> array( 'SmartQ', 'T20', TYPE_TABLET ),
+			'T20'										=> array( 'SmartQ', 'T20', TYPE_TABLET ),
+			'T30'										=> array( 'SmartQ', 'T30', TYPE_TABLET ),
 			'OMS1 6'									=> array( 'Sony Ericsson', 'A8i' ),
 			'C15(04|05)!'								=> array( 'Sony', 'Xperia E' ),
 			'C16(04|05)!'								=> array( 'Sony', 'Xperia E dual' ),
-			'C21(04|05)!'								=> array( 'Sony', 'Xperia "Gaga"' ),
+			'C21(04|05)!'								=> array( 'Sony', 'Xperia L' ),
 			'C3602'										=> array( 'Sony', 'Xperia "Togari"' ),
-			'C430[0-9]!'								=> array( 'Sony', 'C430X' ),
-			'C5303'										=> array( 'Sony', 'Xperia "HuaShan"' ),
+			'C53(02|03|06)!'							=> array( 'Sony', 'Xperia SP' ),
 			'C550[0-9]!'								=> array( 'Sony', 'Xperia "Dogo"' ),
 			'C65(02|03|06)!'							=> array( 'Sony', 'Xperia ZL' ),
-			'C6603'										=> array( 'Sony', 'Xperia Z' ),
+			'C66(02|03|06)!'							=> array( 'Sony', 'Xperia Z' ),
+			'C670[0-9]!'								=> array( 'Sony', 'Xperia "Honami"' ),
+//			'C6750'										
+			'C6802'										=> array( 'Sony', 'Xperia "Gaga"' ),
+			'C69(02|07)!'								=> array( 'Sony', 'Xperia Tablet Z', TYPE_TABLET ),
 			'E10(a|i|iv)!'								=> array( 'Sony Ericsson', 'Xperia X10 Mini' ),
 			'E15(a|i|iv|i-o)?$!'						=> array( 'Sony Ericsson', 'Xperia X8' ),
 			'E16i!'										=> array( 'Sony Ericsson', 'W8 Walkman' ),
+			'L36h'										=> array( 'Sony', 'Xperia Z' ),
 			'LT11i!'									=> array( 'Sony Ericsson', 'Xperia Neo V' ),
 			'LT15(a|i|iv|i-o)?$!'						=> array( 'Sony Ericsson', 'Xperia Arc' ),
 			'LT15i Speed Edition'						=> array( 'Sony Ericsson', 'Xperia Arc' ),
@@ -1906,7 +2561,7 @@ class DeviceModels {
 			'ST15(a|i)!'								=> array( 'Sony Ericsson', 'Xperia Mini' ),
 			'ST17(a|i)!'								=> array( 'Sony Ericsson', 'Xperia Active' ),
 			'ST18(a|av|i|iv)!'							=> array( 'Sony Ericsson', 'Xperia Ray' ),
-			'ST21(a|i)?$!'								=> array( 'Sony', 'Xperia Tipo' ),
+			'ST21(a|i|i-o|iv)?$!'						=> array( 'Sony', 'Xperia Tipo' ),
 			'ST21(a2|i2)!'								=> array( 'Sony', 'Xperia Tipo Dual' ),
 			'ST23(a|i)!'								=> array( 'Sony', 'Xperia Miro' ),
 			'ST25(a|i)!'								=> array( 'Sony', 'Xperia U' ),
@@ -1917,7 +2572,7 @@ class DeviceModels {
 			'WT18i!'									=> array( 'Sony Ericsson', 'Walkman' ),
 			'WT19(a|i|iv)!'								=> array( 'Sony Ericsson', 'Live with Walkman' ),
 			'X8'										=> array( 'Sony Ericsson', 'Xperia X8' ),
-			'X10(a|i|iv|s)?$!'							=> array( 'Sony Ericsson', 'Xperia X10' ),
+			'X10(a|i|iv|i-o|s)?$!'						=> array( 'Sony Ericsson', 'Xperia X10' ),
 			'X10 ?(Mini|Mini Pro)$!'					=> array( 'Sony Ericsson', 'Xperia X10 Mini Pro' ),
 			'Z1i'										=> array( 'Sony Ericsson', 'Xperia Play' ),
 			'S51SE'										=> array( 'Sony Ericsson', 'Xperia Mini' ),
@@ -1932,80 +2587,120 @@ class DeviceModels {
 			'SO-02E'									=> array( 'Sony', 'Xperia Z' ),
 			'SO-03C'									=> array( 'Sony Ericsson', 'Xperia Ray' ),
 			'SO-03D'									=> array( 'Sony Ericsson', 'Xperia Acro HD' ),
-			'SO-03E'									=> array( 'Sony', 'Xperia "Honami"' ),
+			'SO-03E'									=> array( 'Sony', 'Xperia Tablet Z', TYPE_TABLET ),
 			'SO-04D'									=> array( 'Sony', 'Xperia GX' ),
+			'SO-04E'									=> array( 'Sony', 'Xperia "Dogo"' ),
 			'SO-05D'									=> array( 'Sony', 'Xperia SX' ),
 			'SOL21'										=> array( 'Sony', 'Xperia VL' ),
 			'Xperia X1'									=> array( 'Sony Ericsson', 'Xperia X1' ),
 			'Xperia X8'									=> array( 'Sony Ericsson', 'Xperia X8' ),
 			'Xperia X10'								=> array( 'Sony Ericsson', 'Xperia X10' ),
-			'Xperia Ray'								=> array( 'Sony Ericsson', 'Xperia Ray' ),
 			'Xperia Acro S'								=> array( 'Sony', 'Xperia Acro S' ),
+			'Xperia Active'								=> array( 'Sony Ericsson', 'Xperia Active' ),
 			'Xperia Arc'								=> array( 'Sony Ericsson', 'Xperia Arc' ),
 			'Xperia Arc S'								=> array( 'Sony Ericsson', 'Xperia Arc S' ),
+			'Xperia Go'									=> array( 'Sony', 'Xperia Go' ),
 			'Xperia ion'								=> array( 'Sony', 'Xperia Ion' ),
+			'Xperia J'									=> array( 'Sony', 'Xperia J' ),
+			'Xperia Miro'								=> array( 'Sony', 'Xperia Miro' ),
 			'Xperia Mini'								=> array( 'Sony Ericsson', 'Xperia Mini' ),
 			'Xperia Mini Pro'							=> array( 'Sony Ericsson', 'Xperia Mini Pro' ),
 			'Xperia Neo'								=> array( 'Sony Ericsson', 'Xperia Neo' ),
 			'Xperia NeoV'								=> array( 'Sony Ericsson', 'Xperia Neo V' ),
 			'Xperia Neo V'								=> array( 'Sony Ericsson', 'Xperia Neo V' ),
+			'Xperia Neo L'								=> array( 'Sony', 'Xperia Neo L' ),
+			'Xperia P'									=> array( 'Sony', 'Xperia P' ),
 			'Xperia Play'								=> array( 'Sony Ericsson', 'Xperia Play' ),
 			'Xperia Pro'								=> array( 'Sony Ericsson', 'Xperia Pro' ),
+			'Xperia Ray'								=> array( 'Sony Ericsson', 'Xperia Ray' ),
 			'Xperia S'									=> array( 'Sony', 'Xperia S' ),
+			'Xperia SL'									=> array( 'Sony', 'Xperia SL' ),
 			'Xperia Sola'								=> array( 'Sony', 'Xperia Sola' ),
+			'Xperia T'									=> array( 'Sony', 'Xperia T' ),
 			'Xperia Tipo'								=> array( 'Sony', 'Xperia Tipo' ),
+			'Xperia U'									=> array( 'Sony', 'Xperia U' ),
+			'Xperia Z'									=> array( 'Sony', 'Xperia Z' ),
 			'Xperia Live with Walkman'					=> array( 'Sony Ericsson', 'Live with Walkman' ),
 			'Live ?With ?Walkman!'						=> array( 'Sony Ericsson', 'Live with Walkman' ),
+			'Neo V'										=> array( 'Sony Ericsson', 'Xperia Neo V' ),
 			'Hayabusa'									=> array( 'Sony', 'Xperia Ion' ),
 			'Nozomi'									=> array( 'Sony', 'Xperia S' ),
 			'Tablet P'									=> array( 'Sony', 'Tablet P', TYPE_TABLET ),
 			'Tablet S'									=> array( 'Sony', 'Tablet S', TYPE_TABLET ),
-			'SGPT12'									=> array( 'Sony', 'Tablet S', TYPE_TABLET ),
+			'SGPT12'									=> array( 'Sony', 'Xperia Tablet S', TYPE_TABLET ),
+			'SGPT13'									=> array( 'Sony', 'Xperia Tablet S', TYPE_TABLET ),
+			'SGP311'									=> array( 'Sony', 'Xperia Tablet Z', TYPE_TABLET ),
+			'SGP321'									=> array( 'Sony', 'Xperia Tablet Z', TYPE_TABLET ),
 			'NWZ?-Z1000Series!'							=> array( 'Sony', 'Walkman Z', TYPE_MEDIA ),
 			'NSZ-GP9'									=> array( 'Sony', 'NSZ-GP9', TYPE_TELEVISION, FLAG_GOOGLETV ),
 			'NSZ-GS7'									=> array( 'Sony', 'NSZ-GS7', TYPE_TELEVISION, FLAG_GOOGLETV ),
 			'NSZ-GT1'									=> array( 'Sony', 'NSZ-GT1', TYPE_TELEVISION, FLAG_GOOGLETV ),
 			'Spice Mi280'								=> array( 'Spice', 'Mi-280' ),
+			'SPICE Mi-285'								=> array( 'Spice', 'Mi-285' ),
 			'Spice Mi300'								=> array( 'Spice', 'Mi-300' ),
+			'CSL Spice MI300'							=> array( 'Spice', 'Mi-300' ),
 			'Spice Mi-310'								=> array( 'Spice', 'Mi-310' ),
+			'Mi320'										=> array( 'Spice', 'Mi-320' ),
+			'Spice Mi-350'								=> array( 'Spice', 'Mi-350' ),
 			'Spice Mi-355'								=> array( 'Spice', 'Mi-355' ),
+			'CSL-MI410'									=> array( 'Spice', 'Mi-410' ),
 			'Spice Mi-425'								=> array( 'Spice', 'Mi-425' ),
+			'Spice Mi-435'								=> array( 'Spice', 'Mi-435' ),
+			'Spice Mi-495'								=> array( 'Spice', 'Mi-495' ),
 			'Spice Mi-500'								=> array( 'Spice', 'Mi-500' ),
 			'SPICE Mi-720'								=> array( 'Spice', 'Mi-720' ),
+			'SpiceMi1010'								=> array( 'Spice', 'Mi-1010 Stellar Pad', TYPE_TABLET ),
+			'A5000'										=> array( 'Star', 'A5000' ),
 			'A7272+'									=> array( 'Star', 'A7272+' ),
-			'e1109 v73 gq1002 ctp'						=> array( 'Star', 'X18i' ),
+			'N710'										=> array( 'Star', 'N710' ),
+			'e1808 v75!'								=> array( 'Star', 'N8000' ),
+			'V1277'										=> array( 'Star', 'V1277' ),
+			'e1109 v73!'								=> array( 'Star', 'X18i' ),
 			'Cyclone Voyager'							=> array( 'Sumvision', 'Cyclone Voyager', TYPE_TABLET ),
 			'M1001'										=> array( 'Superpad', 'M1001', TYPE_TABLET ),
 			'TS1004T'									=> array( 'Surf 3Q', 'TS1004T', TYPE_TABLET ),
 			'SYTABEX7-2'								=> array( 'Sylvania', 'SYTABEX7', TYPE_TABLET ),
+			'Synrgic Uno M1'							=> array( 'Synrgic', 'Uno M1' ),
 			'KM-S200'									=> array( 'TAKE', 'Janus KM-S200' ),
+			'TCL A506'									=> array( 'TCL', 'A506' ),
 			'TCL A860'									=> array( 'TCL', 'A860' ),
 			'TCL A906'									=> array( 'TCL', 'A906' ),
 			'TCL A909'									=> array( 'TCL', 'A909' ),
 			'TCL A919'									=> array( 'TCL', 'A919' ),
 			'TCL A966'									=> array( 'TCL', 'A966' ),
 			'TCL A968'									=> array( 'TCL', 'A968' ),
+			'TCL A988'									=> array( 'TCL', 'A988' ),
 			'TCL A990'									=> array( 'TCL', 'A990' ),
 			'TCL A996'									=> array( 'TCL', 'A996' ),
 			'TCL A998'									=> array( 'TCL', 'A998' ),
 			'TCL C990+'									=> array( 'TCL', 'C990+' ),
+			'TCL-D668'									=> array( 'TCL', 'D668' ),
 			'TCL GENESEE E708'							=> array( 'TCL', 'Genesee E708' ),
 			'TCL S500'									=> array( 'TCL', 'S500' ),
 			'(TCL )?S600!'								=> array( 'TCL', 'S600' ),
+			'TCL S800'									=> array( 'TCL', 'S800' ),
+			'TCL S820'									=> array( 'TCL', 'S820' ),
 			'TCL S830'									=> array( 'TCL', 'S830' ),
 			'TCL S900'									=> array( 'TCL', 'S900' ),
 			'TCL W939'									=> array( 'TCL', 'W939' ),
+			'TCL W969'									=> array( 'TCL', 'W969' ),
 			'TCL Y710'									=> array( 'TCL', 'Y710' ),
 			'A10t(5DM3)'								=> array( 'Teclast', 'A10T', TYPE_TABLET ),
 			'P72'										=> array( 'Teclast', 'P72', TYPE_TABLET ),
+			'P75HD(M3E5)'								=> array( 'Teclast', 'P75HD', TYPE_TABLET ),
+			'Teclast P76e!'								=> array( 'Teclast', 'P76e', TYPE_TABLET ),
 			'P76TI'										=> array( 'Teclast', 'P76Ti', TYPE_TABLET ),
 			'P81HD'										=> array( 'Teclast', 'P81HD', TYPE_TABLET ),
+			'P85(A9D3)'									=> array( 'Teclast', 'P85', TYPE_TABLET ),
 			'P85(R8A1)'									=> array( 'Teclast', 'P85', TYPE_TABLET ),
-			'Teclast P85'								=> array( 'Teclast', 'P85', TYPE_TABLET ),
+			'Teclast P85!'								=> array( 'Teclast', 'P85', TYPE_TABLET ),
 			'T720 SE'									=> array( 'Teclast', 'T720', TYPE_TABLET ),
 			'T760 from moage.com'						=> array( 'Teclast', 'T760', TYPE_TABLET ),
 			'tegav2'									=> array( 'Tegatech', 'TEGA v2', TYPE_TABLET ),
+			'TM-7024'									=> array( 'teXet', 'TM-7024', TYPE_TABLET ),
 			'TM-7025'									=> array( 'teXet', 'TM-7025', TYPE_TABLET ),
+			'TM-7037W'									=> array( 'teXet', 'TM-7037W', TYPE_TABLET ),
+			'TM-8041HD'									=> array( 'teXet', 'TM-8041HD', TYPE_TABLET ),
 			'MoFing'									=> array( 'Thomson', 'MoFing', TYPE_TABLET ),
 			'Ultimate10'								=> array( 'Tomtec', 'Ultimate10', TYPE_TABLET ),
 			'ThL V7'									=> array( 'THL', 'V7' ),
@@ -2015,6 +2710,12 @@ class DeviceModels {
 			'ThL V12'									=> array( 'THL', 'V12' ),
 			'ThL W1'									=> array( 'THL', 'W1' ),
 			'ThL W3'									=> array( 'THL', 'W3' ),
+			'ThL W3dc'									=> array( 'THL', 'W3' ),
+			'ThL W5'									=> array( 'THL', 'W5' ),
+			'ThL W7'									=> array( 'THL', 'W7' ),
+			'ThL W8'									=> array( 'THL', 'W8' ),
+			'TOOKY T83'									=> array( 'Tooky', 'T83' ),
+			'TOOKY T1982'								=> array( 'Tooky', 'T1982' ),
 			'TSB CLOUD COMPANION;TOSHIBA AC AND AZ'		=> array( 'Toshiba', 'Dynabook AZ', 'desktop' ),
 			'TOSHIBA AC AND AZ'							=> array( 'Toshiba', 'Dynabook AZ', 'desktop' ),
 			'TOSHIBA FOLIO AND A'						=> array( 'Toshiba', 'Folio 100', TYPE_TABLET ),
@@ -2027,7 +2728,10 @@ class DeviceModels {
 			'Tostab03'									=> array( 'Toshiba', 'Regza AT100', TYPE_TABLET ),
 			'AT100'										=> array( 'Toshiba', 'Regza AT100', TYPE_TABLET ),
 			'AT200'										=> array( 'Toshiba', 'Regza AT200', TYPE_TABLET ),
+			'AT270'										=> array( 'Toshiba', 'Regza AT270', TYPE_TABLET ),
 			'AT300'										=> array( 'Toshiba', 'Regza AT300', TYPE_TABLET ),
+			'AT300SE'									=> array( 'Toshiba', 'Regza AT300SE', TYPE_TABLET ),
+			'AT330'										=> array( 'Toshiba', 'Regza AT330', TYPE_TABLET ),
 			'AT470'										=> array( 'Toshiba', 'Regza AT470', TYPE_TABLET ),
 			'AT500'										=> array( 'Toshiba', 'Regza AT500', TYPE_TABLET ),
 			'AT570'										=> array( 'Toshiba', 'Regza AT570', TYPE_TABLET ),
@@ -2035,10 +2739,13 @@ class DeviceModels {
 			'Folio 100'									=> array( 'Toshiba', 'Folio 100', TYPE_TABLET ),
 			'folio100'									=> array( 'Toshiba', 'Folio 100', TYPE_TABLET ),
 			'THRiVE'									=> array( 'Toshiba', 'THRiVE', TYPE_TABLET ),
+			'TRACER OXYGEN GS1'							=> array( 'Tracer', 'Oxygen GS1' ),
+			'TREQ A10C'									=> array( 'Treq', 'A10C', TYPE_TABLET ),
 			'Fantastic T3'								=> array( 'TWM', 'Fantastic T3' ),
 			'TB100'										=> array( 'Unitech', 'TB100', TYPE_TABLET ),
 			'M70014'									=> array( 'United Star Technology', 'M70014', TYPE_TABLET ),
 			'UMI X1'									=> array( 'UMI', 'X1' ),
+			'U1203'										=> array( 'Uniscope', 'U1203' ),
 			'PS47'										=> array( 'Velocity Micro', 'Cruz PS47', TYPE_TABLET ),
 			'T301'										=> array( 'Velocity Micro', 'Cruz T301', TYPE_TABLET ),
 			'Vibo-A688'									=> array( 'FIH', 'Vibo A688' ),
@@ -2048,18 +2755,36 @@ class DeviceModels {
 			'TeamDRH ICS for GTablet'					=> array( 'ViewSonic', 'gTablet', TYPE_TABLET ),
 			'ViewPad7'									=> array( 'ViewSonic', 'ViewPad 7', TYPE_TABLET ),
 			'ViewPad 10e'								=> array( 'ViewSonic', 'ViewPad 10e', TYPE_TABLET ),
+			'ViewPad 10S'								=> array( 'ViewSonic', 'ViewPad 10s', TYPE_TABLET ),
+			'ViewPad97A'								=> array( 'ViewSonic', 'ViewPad 97a', TYPE_TABLET ),
+			'VSD220'									=> array( 'ViewSonic', 'VSD220', TYPE_DESKTOP ),
 			'VINUS V8'									=> array( 'Vinus', 'V8' ),
 			'vivo E1'									=> array( 'Vivo', 'E1' ),
+			'vivo E3'									=> array( 'Vivo', 'E3' ),
+			'vivo S1'									=> array( 'Vivo', 'S1' ),
+			'vivo S3'									=> array( 'Vivo', 'S3' ),
+			'vivo S3+'									=> array( 'Vivo', 'S3+' ),
+			'vivo S6'									=> array( 'Vivo', 'S6' ),
+			'vivo S6T'									=> array( 'Vivo', 'S6T' ),
 			'vivo S7'									=> array( 'Vivo', 'S7' ),
+			'vivo S9'									=> array( 'Vivo', 'S9' ),
+			'vivo S11t'									=> array( 'Vivo', 'S11' ),
+			'vivo S12'									=> array( 'Vivo', 'S12' ),
+			'vivo V1'									=> array( 'Vivo', 'V1' ),
 			'vivo V2'									=> array( 'Vivo', 'V2' ),
 			'vivo X1'									=> array( 'Vivo', 'X1' ),
+			'vivo Y3t'									=> array( 'Vivo', 'Y3T' ),
 			'VTAB1008'									=> array( 'Vizio', 'VTAB1008', TYPE_TABLET ),
 			'VTAB3010'									=> array( 'Vizio', 'VTAB3010', TYPE_TABLET ),
 			'VOTO W5300'								=> array( 'VOTO', 'W5300' ),
 			'Vsun i9'									=> array( 'Vsun Mobile', 'i9' ),
 			'xPAD-70'									=> array( 'WayteQ', 'xPAD-70', TYPE_TABLET ),
-			'xTAB-70'									=> array( 'WayteQ', 'xTAB-70', TYPE_TABLET ),
+			'xTAB-70!'									=> array( 'WayteQ', 'xTAB-70', TYPE_TABLET ),
 			'WellcoM-A99'								=> array( 'WellcoM', 'A99' ),
+			'WellcoM-A800'								=> array( 'WellcoM', 'A800', TYPE_TABLET ),
+			'WEXLER-TAB-7T'								=> array( 'Wexler', 'Tab 7T', TYPE_TABLET ),
+			'CINK KING'									=> array( 'Wiko', 'Cink King' ),
+			'CINK PEAX'									=> array( 'Wiko', 'Cink Peax' ),
 			'WIKO-CINK SLIM'							=> array( 'Wiko', 'Cink Slim' ),
 			'N5PRO2jingying'							=> array( 'Window', 'N5 Pro 2', TYPE_MEDIA ),
 			'N12'										=> array( 'Window', 'N12', TYPE_TABLET ),
@@ -2069,17 +2794,23 @@ class DeviceModels {
 			'N50GT'										=> array( 'Window', 'N50GT', TYPE_TABLET ),
 			'N50GT A'									=> array( 'Window', 'N50GT-A', TYPE_TABLET ),
 			'N70'										=> array( 'Window', 'N70', TYPE_TABLET ),
+			'N70DC'										=> array( 'Window', 'N70DC', TYPE_TABLET ),
 			'N70-S'										=> array( 'Window', 'N70S', TYPE_TABLET ),
 			'N70HD'										=> array( 'Window', 'N70HD', TYPE_TABLET ),
 			'N70 DUAL CORE'								=> array( 'Window', 'N70 Dual Core', TYPE_TABLET ),
+			'N70DC-S'									=> array( 'Window', 'N70 Dual Core', TYPE_TABLET ),
 			'N70DC-T'									=> array( 'Window', 'N70 Dual Core', TYPE_TABLET ),
 			'N80($| from moage.com)!'					=> array( 'Window', 'N80', TYPE_TABLET ),
 			'N80DC'										=> array( 'Window', 'N80 Dual Core', TYPE_TABLET ),
+			'N80IPS'									=> array( 'Window', 'N80 IPS', TYPE_TABLET ),
 			'N90'										=> array( 'Window', 'N90', TYPE_TABLET ),
 			'N90 DUAL CORE!'							=> array( 'Window', 'N90 Dual Core', TYPE_TABLET ),
 			'N101 DUAL CORE!'							=> array( 'Window', 'N101 Dual Core', TYPE_TABLET ),
 			'N612'										=> array( 'Wishway', 'N612' ),
+			'A81E'										=> array( 'Witstech', 'A81E', TYPE_TABLET ),
 			'AT-AS43D'									=> array( 'Wolfgang', 'AT-AS43D' ),
+			'AT-AS43D2'									=> array( 'Wolfgang', 'AT-AS43D2' ),
+			'AT-AS45SE'									=> array( 'Wolfgang', 'AT-AS45SE' ),
 			'M12'										=> array( 'Wopad', 'M12', TYPE_TABLET ),
 			'WM8650'									=> array( 'WonderMedia', 'WM8650', TYPE_TABLET ),
 			'WM8850-mid'								=> array( 'WonderMedia', 'WM8850', TYPE_TABLET ),
@@ -2087,10 +2818,13 @@ class DeviceModels {
 			'MI 1S'										=> array( 'Xiaomi', 'MI-ONE S' ),
 			'MI 1SC'									=> array( 'Xiaomi', 'MI-ONE SC' ),
 			'MI-ONE C1'									=> array( 'Xiaomi', 'MI-ONE C1' ),
-			'MI-ONE Plus'								=> array( 'Xiaomi', 'MI-ONE Plus' ),
+			'MI-ONE Plus!'								=> array( 'Xiaomi', 'MI-ONE Plus' ),
 			'mione plus'								=> array( 'Xiaomi', 'MI-ONE Plus' ),
 			'MI 2'										=> array( 'Xiaomi', 'MI-TWO' ),
+			'MI 2C'										=> array( 'Xiaomi', 'MI-TWO' ),
 			'MI-TWO'									=> array( 'Xiaomi', 'MI-TWO' ),
+			'X403'										=> array( 'Xtouch', 'X403' ),
+			'X506'										=> array( 'Xtouch', 'X506' ),
 			'Q07CL01'									=> array( 'XVision', 'Q07', TYPE_TABLET ),
 			'N6'										=> array( 'Yarvik', 'TAB210 Tablet', TYPE_TABLET ),
 			'TAB224'									=> array( 'Yarvik', 'TAB224 GoTab Velocity', TYPE_TABLET ),
@@ -2135,16 +2869,20 @@ class DeviceModels {
 			'ZTE V788!'									=> array( 'ZTE', 'V788 Kis' ),
 			'ZTE U788!'									=> array( 'ZTE', 'U788 Kis' ),
 			'ZTE U790'									=> array( 'ZTE', 'U790' ),
+			'ZTE V790'									=> array( 'ZTE', 'V790' ),
+			'ZTE V791'									=> array( 'ZTE', 'V791' ),
+			'ZTE V793'									=> array( 'ZTE', 'V793' ),
 			'ZTE U795'									=> array( 'ZTE', 'U795' ),
 			'ZTE T U802'								=> array( 'ZTE', 'U802' ),
 			'RacerII'									=> array( 'ZTE', 'U806 Racer II' ),
 			'ZTE T U806'								=> array( 'ZTE', 'U806 Racer II' ),
+			'ZTE U807'									=> array( 'ZTE', 'U807' ),
 			'E810'										=> array( 'ZTE', 'E810' ),
 			'ZTE T U812'								=> array( 'ZTE', 'U812' ),
+			'ZTE U817'									=> array( 'ZTE', 'U817' ),
 			'ZTE GV821'									=> array( 'ZTE', 'V821' ),
 			'ZTE T U830'								=> array( 'ZTE', 'U830' ),		
 			'ZTE Racer'									=> array( 'ZTE', 'X850 Racer' ),
-			'MTC 916'									=> array( 'ZTE', 'X850 Racer' ),
 			'Racer'										=> array( 'ZTE', 'X850 Racer' ),
 			'ZTE U X850'								=> array( 'ZTE', 'X850 Racer' ),
 			'ZTE U V852'								=> array( 'ZTE', 'V852 Dreamer' ),
@@ -2167,7 +2905,9 @@ class DeviceModels {
 			'Blade(-V880|-opda)?$!'						=> array( 'ZTE', 'V880 Blade' ),
 			'ZTE N880E'									=> array( 'ZTE', 'N880E' ),
 			'ZTE N880F'									=> array( 'ZTE', 'N880F' ),
+			'ZTE N880G'									=> array( 'ZTE', 'N880G' ),
 			'ZTE N881E'									=> array( 'ZTE', 'N881E' ),
+			'ZTE N881F'									=> array( 'ZTE', 'N881F' ),
 			'BLADEII'									=> array( 'ZTE', 'V881 Blade II' ),
 			'Blade2'									=> array( 'ZTE', 'V881 Blade II' ),
 			'ZTE U V881'								=> array( 'ZTE', 'V881 Blade II' ),		
@@ -2184,6 +2924,7 @@ class DeviceModels {
 			'ZTE Grand X'								=> array( 'ZTE', 'U930 Grand X' ),
 			'Grand X In'								=> array( 'ZTE', 'U930 Grand X' ),
 			'ZTE U930 Ultimate'							=> array( 'ZTE', 'U930 Grand X' ),
+			'ZTE U935'									=> array( 'ZTE', 'U935' ),
 			'ZTE U950'									=> array( 'ZTE', 'U950' ),
 			'ZTE V955'									=> array( 'ZTE', 'V955' ),
 			'ZTE (U )?V960!'							=> array( 'ZTE', 'V960 Skate' ),
@@ -2192,18 +2933,30 @@ class DeviceModels {
 			'ZTE U960s3'								=> array( 'ZTE', 'U960s3' ),
 			'ZTE N970'									=> array( 'ZTE', 'N970 Grand X' ),
 			'ZTE U970'									=> array( 'ZTE', 'U970 Grand X' ),
-			'ZTE V970'									=> array( 'ZTE', 'Z970 Grand X' ),
+			'ZTE V970!'									=> array( 'ZTE', 'Z970 Grand X' ),
+			'ZTE N983'									=> array( 'ZTE', 'N983' ),
+			'Grand X Pro'								=> array( 'ZTE', 'V983 Grand X Pro' ),
 			'ZTE U985'									=> array( 'ZTE', 'U985 Grand Era' ),
+			'ZTE V985'									=> array( 'ZTE', 'V985 Grand Era' ),
+			'ZTE V987'									=> array( 'ZTE', 'V987' ),
 			'ZTE Roamer'								=> array( 'ZTE', 'Z990 Roamer ' ),
 			'ZTE Z990!'									=> array( 'ZTE', 'Z990 Roamer' ),
+			'V8000 USA Cricket'							=> array( 'ZTE', 'V8000 Engage' ),
+			'X501 USA Cricket'							=> array( 'ZTE', 'X501 Groove' ),
+			'ZXY-ZTE V6700'								=> array( 'ZTE', 'V6700' ),
+			'N9100'										=> array( 'ZTE', 'N9100 Force' ),
+			'ZTE N9120'									=> array( 'ZTE', 'N9120 Avid' ),
 			'N9500'										=> array( 'ZTE', 'N9500 Flash' ),
 			'003Z'										=> array( 'ZTE', 'Softbank 003Z' ),
 			'008Z'										=> array( 'ZTE', 'Softbank 008Z' ),
 			'009Z'										=> array( 'ZTE', 'Softbank Star7' ),
-			'ZP100'										=> array( 'Zopo', 'ZP100' ),
-			'ZP200'										=> array( 'Zopo', 'ZP200' ),
-			'ZP300'										=> array( 'Zopo', 'ZP300' ),
-			'ZP500'										=> array( 'Zopo', 'ZP500' ),
+			'(Zopo )?ZP100!'							=> array( 'Zopo', 'ZP100 Pilot' ),
+			'ZP200'										=> array( 'Zopo', 'ZP200 Shining' ),
+			'ZP300'										=> array( 'Zopo', 'ZP300 Field' ),
+			'ZP300+'									=> array( 'Zopo', 'ZP300 Field Plus' ),
+			'ZP500'										=> array( 'Zopo', 'ZP500 Libero' ),
+			'(Zopo )?ZP900!'							=> array( 'Zopo', 'ZP900 Leader' ),
+			'ZP950'										=> array( 'Zopo', 'ZP950 Phablet' ),
 	
 			/* Telecom provider branded devices */
 			'i-mobile i691'								=> array( 'i-Mobile', 'i691' ),
@@ -2211,14 +2964,24 @@ class DeviceModels {
 			'i-mobile i858'								=> array( 'i-Mobile', 'i858' ),
 			'i-mobile 3G 8500'							=> array( 'i-Mobile', '3G 8500' ),
 			'i-mobile IQ 1'								=> array( 'i-Mobile', 'iQ 1' ),	
+			'i-mobile IQ 2'								=> array( 'i-Mobile', 'iQ 2' ),	
+			'i-mobile IQ 2A'							=> array( 'i-Mobile', 'iQ 2A' ),	
+			'i-mobile IQ 5'								=> array( 'i-Mobile', 'iQ 5' ),	
+			'i-mobile IQ 6'								=> array( 'i-Mobile', 'iQ 6' ),	
+			'i-mobile IQ 6A'							=> array( 'i-Mobile', 'iQ 6A' ),	
+			'i-STYLE 1'									=> array( 'i-Mobile', 'i-Style 1' ),	
 			'i-mobile i-style 3'						=> array( 'i-Mobile', 'i-Style 3' ),	
+			'i-mobile i-STYLE 4'						=> array( 'i-Mobile', 'i-Style 4' ),	
+			'i-MOBILE i-STYLE 5'						=> array( 'i-Mobile', 'i-Style 5' ),	
 			'i-mobile i-style Q1'						=> array( 'i-Mobile', 'i-Style Q1' ),						
 			'i-mobile i-STYLE Q2'						=> array( 'i-Mobile', 'i-Style Q2' ),			
 			'i-mobile i-STYLE Q2 DUO'					=> array( 'i-Mobile', 'i-Style Q2 Duo' ),
+			'i-STYLE Q2 DUO'							=> array( 'i-Mobile', 'i-Style Q2 Duo' ),
 			'i-mobile i-style Q3'						=> array( 'i-Mobile', 'i-Style Q3' ),				
 			'i-mobile i-STYLE Q6'						=> array( 'i-Mobile', 'i-Style Q6' ),						
 			'i-mobile I-Note'							=> array( 'i-Mobile', 'i-Note', TYPE_TABLET ),
 			'i-mobile i-note WiFi 7'					=> array( 'i-Mobile', 'i-Note 7', TYPE_TABLET ),
+			'i-mobile i-note WiFi 9'					=> array( 'i-Mobile', 'i-Note 9', TYPE_TABLET ),
 	
 			'Etisalat Smartphone'						=> array( 'Etisalat', 'Smartphone' ),	
 			
@@ -2227,6 +2990,7 @@ class DeviceModels {
 			'Optimus Monte Carlo'						=> array( 'Optimus', 'Monte Carlo' ),						/* ZTE Skate */
 			
 			'Orange Boston'								=> array( 'Orange', 'Boston' ),								/* Gigabyte GSmart G1305 */
+			'Orange Daytona'							=> array( 'Orange', 'Daytona' ),						
 			'Orange Monte Carlo'						=> array( 'Orange', 'Monte Carlo' ),						/* ZTE Skate */
 			'San Francisco'								=> array( 'Orange', 'San Francisco' ),						/* ZTE Blade */
 			'San Francisco for Orange'					=> array( 'Orange', 'San Francisco' ),						/* ZTE Blade */
@@ -2254,18 +3018,35 @@ class DeviceModels {
 			'T-Mobile myTouch Q'						=> array( 'T-Mobile', 'myTouch Q' ),						/* Huawei U8730 */
 			'LG-C800'									=> array( 'T-Mobile', 'myTouch Q' ),
 			'Pulse Mini'								=> array( 'T-Mobile', 'Pulse Mini' ),						/* Huawei U8110 */
+			'T-Mobile Vivacity'							=> array( 'T-Mobile', 'Vivacity' ),				
+			
+			'Telenor OneTouch'							=> array( 'Telenor', 'One Touch' ),
+			'Telenor One Touch S'						=> array( 'Telenor', 'One Touch S' ),
+			'Telenor Touch Plus'						=> array( 'Telenor', 'Touch Plus' ),
 			
 			'Turkcell Maxi Plus 5'						=> array( 'Turkcell', 'Maxi Plus 5' ),
 			'Turkcell T20'								=> array( 'Turkcell', 'T20' ),
 		
+			'MTC 916'									=> array( 'MTC', '916' ),
 			'MTC 950'									=> array( 'MTC', '950' ),
 			'MTC 955'									=> array( 'MTC', '955' ),
 			'MTC 960'									=> array( 'MTC', '960' ),
 			'MTC Evo'									=> array( 'MTC', 'Evo' ),
+			'MTC Neo'									=> array( 'MTC', 'Neo' ),
+			'MTC Viva'									=> array( 'MTC', 'Viva' ),
+			
+			'QMobile A7'								=> array( 'Q-Mobile', 'Noir A7' ),
+			'QMobile A8'								=> array( 'Q-Mobile', 'Noir A8' ),
+			'Qmobile-S11'								=> array( 'Q-Mobile', 'S11' ),
+			'Q-Smart S18'								=> array( 'Q-Mobile', 'Q-Smart S18' ),
+			'Q-Smart S20'								=> array( 'Q-Mobile', 'Q-Smart S20' ),
 			
 			'Vodafone 845'								=> array( 'Vodafone', '845 Nova' ),							/* Huawei U8100 */
 			'Vodafone 858'								=> array( 'Vodafone', '858 Smart' ),						/* Huawei U8160 */
+			'Vodafone 861'								=> array( 'Vodafone', '861 Smart' ),
 			'Vodafone 945'								=> array( 'Vodafone', '945' ),								/* ZTE Joe */
+			'Vodafone 958'								=> array( 'Vodafone', '958' ),
+			'Vodafone Smart ll'							=> array( 'Vodafone', 'Smart II' ),
 			'Vodafone Smart II'							=> array( 'Vodafone', 'Smart II' ),
 			'SmartTabII7'								=> array( 'Vodafone', 'SmartTab II 7', TYPE_TABLET ),		/* Lenovo */
 			'SmartTab10'								=> array( 'Vodafone', 'SmartTab 10', TYPE_TABLET )			/* ZTE Web Tab 10 */
@@ -2288,6 +3069,7 @@ class DeviceModels {
 			'Coolpad D508'								=> array( 'Coolpad', 'D508' ),
 			'Coolpad E600'								=> array( 'Coolpad', 'E600' ),
 			'SCH-F839'									=> array( 'Samsung', 'SCH-F839' ),
+			'SCH-M519!'									=> array( 'Samsung', 'Metro TV' ),
 			'HS-E316!'									=> array( 'Hisense', 'E316' ),
 		);
 		
@@ -2395,17 +3177,20 @@ class DeviceModels {
 			'LG-E-?900!'								=> array( 'LG', 'Optimus 7 E900' ),
 			'LG-E906'									=> array( 'LG', 'Jil Sander' ),
 			'LG-C900!'									=> array( 'LG', 'Optimus 7Q' ),
-			'(Lumia ?|Nokia )?510!'						=> array( 'Nokia', 'Lumia 510' ),
-			'(Lumia ?|Nokia )?610!'						=> array( 'Nokia', 'Lumia 610' ),
-			'(Lumia ?|Nokia )?710!'						=> array( 'Nokia', 'Lumia 710' ),
+			'Lumia 505'									=> array( 'Nokia', 'Lumia 505' ),
+			'(Lumia ?|Nokia ?)?510!'					=> array( 'Nokia', 'Lumia 510' ),
+			'(Lumia ?|Nokia ?)?610!'					=> array( 'Nokia', 'Lumia 610' ),
+			'(Lumia ?|Nokia ?)?620!'					=> array( 'Nokia', 'Lumia 620' ),
+			'(Lumia ?|Nokia ?)?710!'					=> array( 'Nokia', 'Lumia 710' ),
 			'Lumia 719'									=> array( 'Nokia', 'Lumia 719' ),
-			'(Lumia ?|Nokia )?800!'						=> array( 'Nokia', 'Lumia 800' ),
+			'(Lumia ?|Nokia ?)?800!'					=> array( 'Nokia', 'Lumia 800' ),
 			'SeaRay'									=> array( 'Nokia', 'Lumia 800' ),
 			'Lumia ?810!'								=> array( 'Nokia', 'Lumia 810' ),
 			'Lumia ?820!'								=> array( 'Nokia', 'Lumia 820' ),
 			'Lumia ?822!'								=> array( 'Nokia', 'Lumia 822' ),
-			'(Lumia ?|Nokia )?900!'						=> array( 'Nokia', 'Lumia 900' ),
-			'(Lumia ?|Nokia )?920!'						=> array( 'Nokia', 'Lumia 920' ),
+			'(Lumia ?|Nokia ?)?900!'					=> array( 'Nokia', 'Lumia 900' ),
+			'(Lumia ?|Nokia ?)?920!'					=> array( 'Nokia', 'Lumia 920' ),
+			'RM-8(20|21)!'								=> array( 'Nokia', 'Lumia 920' ),
 			'GT-I8350!'									=> array( 'Samsung', 'Omnia W' ),
 			'GT-i8700'									=> array( 'Samsung', 'Omnia 7' ),
 			'GT-I8750'									=> array( 'Samsung', 'Ativ S' ),
@@ -2428,7 +3213,7 @@ class DeviceModels {
 		);
 		
 		static $S40_MODELS = array(
-			'C1-01'										=> array( 'Nokia', 'C1-01' ),
+			'C1-01!'									=> array( 'Nokia', 'C1-01' ),
 			'C1-02'										=> array( 'Nokia', 'C1-02' ),
 			'C2-00'										=> array( 'Nokia', 'C2-00' ),
 			'C2-01'										=> array( 'Nokia', 'C2-01' ),
@@ -2457,8 +3242,9 @@ class DeviceModels {
 			'303'										=> array( 'Nokia', 'Asha 303' ),
 			'305'										=> array( 'Nokia', 'Asha 305' ),
 			'306'										=> array( 'Nokia', 'Asha 306' ),
-			'309'										=> array( 'Nokia', 'Asha 309' ),
 			'308'										=> array( 'Nokia', 'Asha 308' ),
+			'309'										=> array( 'Nokia', 'Asha 309' ),
+			'310'										=> array( 'Nokia', 'Asha 311' ),
 			'311'										=> array( 'Nokia', 'Asha 311' ),
 			'1682c'										=> array( 'Nokia', '1682 classic' ),
 			'2220s!'									=> array( 'Nokia', '2220 slide' ),
@@ -2500,6 +3286,7 @@ class DeviceModels {
 			'7070!'										=> array( 'Nokia', '7070 Prism' ),
 			'7100s!'									=> array( 'Nokia', '7100 Supernova' ),
 			'7210s!'									=> array( 'Nokia', '7210 Supernova' ),
+			'7210Supernova!'							=> array( 'Nokia', '7210 Supernova' ),					
 			'7230'										=> array( 'Nokia', '7230' ),
 			'7310c!'									=> array( 'Nokia', '7310 Supernova' ),
 			'7510Supernova!'							=> array( 'Nokia', '7510 Supernova' ),
@@ -2623,17 +3410,27 @@ class DeviceModels {
 		);
 		
 		static $FEATURE_MODELS = array(
+			'J105i'										=> array( 'Sony Ericsson', 'Naite' ),
 			'J108[ai]!'									=> array( 'Sony Ericsson', 'Cedar' ),
+			'J10i2'										=> array( 'Sony Ericsson', 'Elm' ),
 			'J20'										=> array( 'Sony Ericsson', 'Hazel' ),
 			'KC910i'									=> array( 'LG', 'KC910i Renoir' ),
 			'KP500!'									=> array( 'LG', 'KP500 Cookie' ),
+			'KU990i'									=> array( 'LG', 'KU990 Viewty' ),
+			'GM360'										=> array( 'LG', 'GM360 Viewty Snap' ),
 			'GS500'										=> array( 'LG', 'GS500 Cookie Plus' ),
+			'GT550'										=> array( 'LG', 'GT550 Encore' ),
+			'GT-C3322'									=> array( 'Samsung', 'GT-C3322 Duos' ),
+			'GT-E2152'									=> array( 'Samsung', 'GT-E2152 Duos' ),
 			'GT-S3350'									=> array( 'Samsung', 'Ch@t 335' ),
 			'GT-S3570'									=> array( 'Samsung', 'Ch@t 357' ),
-			'GT-S5610K'									=> array( 'Samsung', 'Primo' ),
+			'GT-S5229'									=> array( 'Samsung', 'Tocco Lite 2' ),
+			'GT-S5610!'									=> array( 'Samsung', 'Primo' ),
 			'SGH-A667'									=> array( 'Samsung', 'A667 Evergreen' ),
+			'SGH-A877'									=> array( 'Samsung', 'A877 Impression' ),
+			'SGH-S390G'									=> array( 'Samsung', 'S390 TracFone' )
 		);
-
+		
 		static $BLACKBERRY_MODELS = array(
 			'9000'		=> 'Bold',
 			'9600'		=> 'Bold',
@@ -2668,6 +3465,7 @@ class DeviceModels {
 			'8230'		=> 'Pearl',
 			'9100'		=> 'Pearl',
 			'9105'		=> 'Pearl',
+			'9500'		=> 'Storm',
 			'9530'		=> 'Storm',
 			'9550'		=> 'Storm',
 			'9670'		=> 'Style',
@@ -2767,6 +3565,7 @@ function cleanup($s = '') {
 			$s = preg_replace('/^tita on /', '', $s);
 			$s = preg_replace('/^ICS AOSP on /', '', $s);
 			$s = preg_replace('/^Android (on |for )/', '', $s);
+			$s = preg_replace('/^Generic Android on /', '', $s);
 			$s = preg_replace('/^Full (AOSP on |Android on |Cappuccino on |MIPS Android on |Android)/', '', $s);
 
 			$s = preg_replace('/^Acer( |-)?/i', '', $s);
@@ -2782,6 +3581,7 @@ function cleanup($s = '') {
 			$s = preg_replace('/^HW-/', '', $s);
 			$s = preg_replace('/^Huawei[ -]/i', 'Huawei ', $s);
 			$s = preg_replace('/^SAMSUNG[ -]/i', '', $s);
+			$s = preg_replace('/^SAMSUNG SAMSUNG-/i', '', $s);
 			$s = preg_replace('/^(Sony ?Ericsson|Sony)/', '', $s);
 			$s = preg_replace('/^(Lenovo Lenovo|LNV-Lenovo|LENOVO-Lenovo)/', 'Lenovo', $s);
 			$s = preg_replace('/^Lenovo-/', 'Lenovo', $s);
@@ -2840,6 +3640,37 @@ function __construct($headers) {
 			if (isset($this->headers['X-Original-User-Agent'])) $this->analyseAlternativeUserAgent($this->headers['X-Original-User-Agent']);
 			if (isset($this->headers['X-Device-User-Agent'])) $this->analyseAlternativeUserAgent($this->headers['X-Device-User-Agent']);
 			if (isset($this->headers['Device-Stock-UA'])) $this->analyseAlternativeUserAgent($this->headers['Device-Stock-UA']);
+
+			if (isset($this->headers['X-Requested-With'])) $this->analyseBrowserId($this->headers['X-Requested-With']);
+		}
+		
+		function analyseBrowserId($id) {
+			$browser = BrowserIds::identify('android', $id);
+			if ($browser) {
+				if (!isset($this->browser->name) || $this->browser->name != $browser) {
+					$this->browser->name = $browser;
+					$this->browser->version = null;
+					$this->browser->stock = false;
+				}
+			}
+
+			if ($this->os->name != 'Android' && $this->os->name != 'Aliyun OS') {
+				$this->os->name = 'Android';
+				$this->os->version = null;
+				
+				$this->device->manufacturer = null;
+				$this->device->model = null;
+				$this->device->identified = false;
+				
+				if ($this->device->type != TYPE_MOBILE && $this->device->type != TYPE_TABLET) {
+					$this->device->type = TYPE_MOBILE;
+				}
+			}
+			
+			if ($this->engine->name != 'Webkit') {
+				$this->engine->name = 'Webkit';
+				$this->engine->version = null;
+			}
 		}
 		
 		function analyseAlternativeUserAgent($ua) {
@@ -2872,6 +3703,12 @@ function analyseUCUserAgent($ua) {
 		function analysePuffinUserAgent($ua) {
 			$parts = explode('/', $ua);
 			
+			if ($this->browser->name != 'Puffin') {
+				$this->browser->name = 'Puffin';
+				$this->browser->version = null;
+				$this->browser->stock = false;
+			}
+		
 			$this->device->type = 'mobile';
 			
 			if (count($parts) > 1 && $parts[0] == 'Android') {
@@ -2885,6 +3722,31 @@ function analysePuffinUserAgent($ua) {
 					$this->device = $device;
 				}
 			}
+
+			if (count($parts) > 1 && $parts[0] == 'iPhone OS') {
+				if (!isset($this->os->name) || $this->os->name != 'iOS') {
+					$this->os->name = 'iOS';
+					$this->os->version = null;
+				}
+				
+				if (preg_match('/iPod( touch)?/', $parts[1])) {
+					$this->device->type = TYPE_MEDIA;
+					$this->device->manufacturer = 'Apple';
+					$this->device->model = 'iPod touch';
+				} 
+				else if (preg_match('/(?:Unknown )?iPhone( 3G| 3GS| 4| 4S| 5)?/', $parts[1], $match)) {
+					$this->device->type = TYPE_MOBILE;
+					$this->device->manufacturer = 'Apple';
+					$this->device->model = 'iPhone' . (isset($match[1]) ? $match[1] : '');
+				} 
+				else if (preg_match('/iPad/', $parts[1])) {
+					$this->device->type = TYPE_TABLET;
+					$this->device->manufacturer = 'Apple';
+					$this->device->model = 'iPad';
+				}
+				
+				$this->device->identified = true;
+			}
 		}
 		
 		function analyseUserAgent($ua) {
@@ -2931,6 +3793,23 @@ function analyseUserAgent($ua) {
 			}
 			
 			
+			/****************************************************
+			 *		Solaris
+			 */
+		
+			if (preg_match('/IRIX/', $ua)) {
+				$this->os->name = 'IRIX';
+
+				if (preg_match('/IRIX ([0-9.]*)/', $ua, $match)) {
+					$this->os->version = new Version(array('value' => $match[1]));
+				}
+
+				if (preg_match('/IRIX;(?:64|32) ([0-9.]*)/', $ua, $match)) {
+					$this->os->version = new Version(array('value' => $match[1]));
+				}
+			}
+			
+			
 			/****************************************************
 			 *		Syllable
 			 */
@@ -3139,6 +4018,8 @@ function analyseUserAgent($ua) {
 					$this->os->version = new Version(array('value' => $match[1]));
 					
 					switch($match[1]) {
+						case '6.3':		$this->os->version = new Version(array('value' => $match[1], 'alias' => '"Blue"')); break;
+
 						case '6.2':		if (preg_match('/; ARM;/', $ua))
 											$this->os->version = new Version(array('value' => $match[1], 'alias' => 'RT')); 
 										else
@@ -3214,7 +4095,7 @@ function analyseUserAgent($ua) {
 					$this->device->type = TYPE_MOBILE;
 				}
 
-				if (preg_match('/Windows Mobile/', $ua)) {
+				if (preg_match('/Windows ?Mobile/', $ua)) {
 					$this->os->name = 'Windows Mobile';
 					$this->device->type = TYPE_MOBILE;
 				}
@@ -3461,8 +4342,17 @@ function analyseUserAgent($ua) {
 				$this->os->name = 'BlackBerry';
 				$this->os->version = new Version(array('value' => $match[1], 'details' => 2));
 				
-				$this->device->manufacturer = 'RIM';
-				$this->device->model = 'BlackBerry ' . $match[2];
+				$this->device->manufacturer = 'BlackBerry';
+				$this->device->model = $match[2];
+				
+				if ($this->device->model == 'Kbd') {
+					$this->device->model = 'Q10';
+				} 
+				
+				if ($this->device->model == 'Touch') {
+					$this->device->model = 'Z10 or Dev Alpha';
+				} 
+				
 				$this->device->type = preg_match('/Mobile/', $ua) ? TYPE_MOBILE : TYPE_TABLET;
 				$this->device->identified = true;
 
@@ -3502,10 +4392,10 @@ function analyseUserAgent($ua) {
 			 *		WebOS
 			 */
 		
-			if (preg_match('/(?:web|hpw)OS\/([0-9.]*)/', $ua, $match)) {
+			if (preg_match('/(?:web|hpw)OS\/(?:HP webOS )?([0-9.]*)/', $ua, $match)) {
 				$this->os->name = 'webOS';
 				$this->os->version = new Version(array('value' => $match[1], 'details' => 2));
-				$this->device->type = preg_match('/Tablet/', $ua) ? TYPE_TABLET : TYPE_MOBILE;
+				$this->device->type = preg_match('/Tablet/i', $ua) ? TYPE_TABLET : TYPE_MOBILE;
 
 				if (preg_match('/Pre\/1.0/', $ua)) $this->device->model = 'Pre';
 				if (preg_match('/Pre\/1.1/', $ua)) $this->device->model = 'Pre Plus';
@@ -3727,6 +4617,15 @@ function analyseUserAgent($ua) {
 				$this->device->type = TYPE_MOBILE;
 			}
 
+			/****************************************************
+			 *		MAUI Runtime
+			 */
+		
+			if (preg_match('/\(MAUI Runtime;/', $ua)) {
+				$this->os->name = 'MAUI Runtime';
+				$this->device->type = TYPE_MOBILE;
+			}
+
 			/****************************************************
 			 *		CrOS
 			 */
@@ -3746,6 +4645,15 @@ function analyseUserAgent($ua) {
 				$this->device->type = TYPE_DESKTOP;
 			}
 			
+			/****************************************************
+			 *		BeOS
+			 */
+		
+			if (preg_match('/BeOS/', $ua)) {
+				$this->os->name = 'BeOS';
+				$this->device->type = TYPE_DESKTOP;
+			}
+			
 			/****************************************************
 			 *		Haiku
 			 */
@@ -3768,7 +4676,7 @@ function analyseUserAgent($ua) {
 			 *		OS/2 Warp
 			 */
 		
-			if (preg_match('/OS\/2; Warp ([0-9.]*)/i', $ua, $match)) {
+			if (preg_match('/OS\/2; (?:U; )?Warp ([0-9.]*)/i', $ua, $match)) {
 				$this->os->name = 'OS/2 Warp';
 				$this->os->version = new Version(array('value' => $match[1]));
 				$this->device->type = TYPE_DESKTOP;
@@ -3804,6 +4712,15 @@ function analyseUserAgent($ua) {
 				$this->device->type = TYPE_DESKTOP;
 			}
 			
+			/****************************************************
+			 *		AROS
+			 */
+		
+			if (preg_match('/AROS/', $ua, $match)) {
+				$this->os->name = 'AROS';
+				$this->device->type = TYPE_DESKTOP;
+			}
+			
 			/****************************************************
 			 *		Kindle
 			 */
@@ -3879,6 +4796,20 @@ function analyseUserAgent($ua) {
 				$this->device->identified = true;
 			}
 
+			/****************************************************
+			 *		Tesla Model S in-car browser
+			 */
+		
+			if (preg_match('/QtCarBrowser/', $ua)) {
+				$this->os->name = '';
+				
+				$this->device->manufacturer = 'Tesla';
+				$this->device->model = 'Model S';
+				$this->device->type = TYPE_CAR;
+				$this->device->identified = true;
+			}
+
+
 			/****************************************************
 			 *		Nintendo
 			 *
@@ -4283,7 +5214,7 @@ function analyseUserAgent($ua) {
 					}
 
 					if (!isset($this->device->model) && $modelName != '' && $modelName != 'modelName') {
-						switch(modelName) {
+						switch($modelName) {
 							case 'GLOBAL_PLAT3':	$this->device->model = 'NetCast TV'; break;
 							case 'GLOBAL_PLAT4':	$this->device->model = 'NetCast TV'; break;
 							case 'SmartTV2012':		$this->device->model = 'Smart TV 2012'; break;
@@ -4830,99 +5761,9 @@ function analyseUserAgent($ua) {
 				}
 			}
 
-			/****************************************************
-			 *		Opera
-			 */
-		
-			if (preg_match('/Opera/i', $ua)) {
-				$this->browser->stock = false;
-				$this->browser->name = 'Opera';
-
-				if (preg_match('/Opera[\/| ]([0-9.]*)/', $ua, $match)) {
-					$this->browser->version = new Version(array('value' => $match[1]));
-				}
-
-				if (preg_match('/Version\/([0-9.]*)/', $ua, $match)) {
-					if (floatval($match[1]) >= 10)
-						$this->browser->version = new Version(array('value' => $match[1]));
-					else
-						$this->browser->version = null;
-				}
-
-				if (is_array($this->browser->version) && preg_match('/Edition Labs/', $ua)) {
-					$this->browser->channel = 'Labs';
-				}
-				
-				if (is_array($this->browser->version) && preg_match('/Edition Next/', $ua)) {
-					$this->browser->channel = 'Next';
-				}
-				
-				if (preg_match('/Opera Tablet/', $ua)) {
-					$this->browser->name = 'Opera Mobile';
-					$this->device->type = TYPE_TABLET;
-				}
-				
-				if (preg_match('/Opera Mobi/', $ua)) {
-					$this->browser->name = 'Opera Mobile';
-					$this->device->type = TYPE_MOBILE;
-				}
-
-				if (preg_match('/Opera Mini;/', $ua)) {
-					$this->browser->name = 'Opera Mini';
-					$this->browser->version = null;
-					$this->browser->mode = 'proxy';
-					$this->device->type = TYPE_MOBILE;
-				}
-				
-				if (preg_match('/Opera Mini\/(?:att\/)?([0-9.]*)/', $ua, $match)) {
-					$this->browser->name = 'Opera Mini';
-					$this->browser->version = new Version(array('value' => $match[1], 'details' => (intval(substr(strrchr($match[1], '.'), 1)) > 99 ? -1 : null)));
-					$this->browser->mode = 'proxy';
-					$this->device->type = TYPE_MOBILE;
-				}
-				
-				if ($this->browser->name == 'Opera' && $this->device->type == TYPE_MOBILE) {
-					$this->browser->name = 'Opera Mobile';
-					
-					if (preg_match('/BER/', $ua)) {
-						$this->browser->name = 'Opera Mini';
-						$this->browser->version = null;
-					}
-				}
-
-				if (preg_match('/InettvBrowser/', $ua)) {
-					$this->device->type = TYPE_TELEVISION;
-				}
-
-				if (preg_match('/Opera[ -]TV/', $ua)) {
-					$this->browser->name = 'Opera';
-					$this->device->type = TYPE_TELEVISION;
-				}
-
-				if (preg_match('/Linux zbov/', $ua)) {
-					$this->browser->name = 'Opera Mobile';
-					$this->browser->mode = 'desktop';
-
-					$this->device->type = TYPE_MOBILE;
-
-					$this->os->name = null;
-					$this->os->version = null;
-				}
-
-				if (preg_match('/Linux zvav/', $ua)) {
-					$this->browser->name = 'Opera Mini';
-					$this->browser->version = null;
-					$this->browser->mode = 'desktop';
-
-					$this->device->type = TYPE_MOBILE;
-
-					$this->os->name = null;
-					$this->os->version = null;
-				}
-				
-				if ($this->device->type == '') {
-					$this->device->type = TYPE_DESKTOP;
-				}
+			if (preg_match('/\(IE ([0-9.]*)/', $ua, $match)) {
+				$this->browser->name = 'Internet Explorer';
+				$this->browser->version = new Version(array('value' => $match[1]));
 			}
 
 			/****************************************************
@@ -5024,6 +5865,14 @@ function analyseUserAgent($ua) {
 					$this->device->type = TYPE_DESKTOP;
 				}
 			}
+			
+			if (preg_match('/PmWFx\/([0-9ab.]*)/', $ua, $match)) {
+				$this->browser->stock = false;
+				$this->browser->name = 'SeaMonkey';
+				$this->browser->version = new Version(array('value' => $match[1]));
+			}
+			
+			
 
 			/****************************************************
 			 *		Netscape
@@ -5069,6 +5918,7 @@ function analyseUserAgent($ua) {
 							$this->browser->channel = 'Beta';
 							break;
 						case '18.0.1025':
+						case '25.0.1364':
 							$this->browser->version->details = 1;
 							break;
 						default:	
@@ -5110,6 +5960,8 @@ function analyseUserAgent($ua) {
 						case '22.0.1229':
 						case '23.0.1271':
 						case '24.0.1312':
+						case '25.0.1364':
+						case '26.0.1410':
 							$this->browser->version->details = 1;
 							break;
 						default:	
@@ -5142,6 +5994,112 @@ function analyseUserAgent($ua) {
 			}	
 			
 			
+			/****************************************************
+			 *		Opera
+			 */
+		
+			if (preg_match('/OPR\/([0-9.]*)/', $ua, $match)) {
+				$this->browser->stock = false;
+				$this->browser->channel = '';
+				$this->browser->name = 'Opera';
+				$this->browser->version = new Version(array('value' => $match[1], 'details' => 2));
+
+				if ($this->device->type == TYPE_MOBILE) {
+					$this->browser->name = 'Opera Mobile';
+				}
+			}
+
+			if (preg_match('/Opera/i', $ua)) {
+				$this->browser->stock = false;
+				$this->browser->name = 'Opera';
+
+				if (preg_match('/Opera[\/| ]([0-9.]*)/', $ua, $match)) {
+					$this->browser->version = new Version(array('value' => $match[1]));
+				}
+
+				if (preg_match('/Version\/([0-9.]*)/', $ua, $match)) {
+					if (floatval($match[1]) >= 10)
+						$this->browser->version = new Version(array('value' => $match[1]));
+					else
+						$this->browser->version = null;
+				}
+
+				if (!is_null($this->browser->version) && preg_match('/Edition Labs/', $ua)) {
+					$this->browser->channel = 'Labs';
+				}
+				
+				if (!is_null($this->browser->version) && preg_match('/Edition Next/', $ua)) {
+					$this->browser->channel = 'Next';
+				}
+				
+				if (preg_match('/Opera Tablet/', $ua)) {
+					$this->browser->name = 'Opera Mobile';
+					$this->device->type = TYPE_TABLET;
+				}
+				
+				if (preg_match('/Opera Mobi/', $ua)) {
+					$this->browser->name = 'Opera Mobile';
+					$this->device->type = TYPE_MOBILE;
+				}
+
+				if (preg_match('/Opera Mini;/', $ua)) {
+					$this->browser->name = 'Opera Mini';
+					$this->browser->version = null;
+					$this->browser->mode = 'proxy';
+					$this->device->type = TYPE_MOBILE;
+				}
+				
+				if (preg_match('/Opera Mini\/(?:att\/)?([0-9.]*)/', $ua, $match)) {
+					$this->browser->name = 'Opera Mini';
+					$this->browser->version = new Version(array('value' => $match[1], 'details' => (intval(substr(strrchr($match[1], '.'), 1)) > 99 ? -1 : null)));
+					$this->browser->mode = 'proxy';
+					$this->device->type = TYPE_MOBILE;
+				}
+				
+				if ($this->browser->name == 'Opera' && $this->device->type == TYPE_MOBILE) {
+					$this->browser->name = 'Opera Mobile';
+					
+					if (preg_match('/BER/', $ua)) {
+						$this->browser->name = 'Opera Mini';
+						$this->browser->version = null;
+					}
+				}
+
+				if (preg_match('/InettvBrowser/', $ua)) {
+					$this->device->type = TYPE_TELEVISION;
+				}
+
+				if (preg_match('/Opera[ -]TV/', $ua)) {
+					$this->browser->name = 'Opera';
+					$this->device->type = TYPE_TELEVISION;
+				}
+
+				if (preg_match('/Linux zbov/', $ua)) {
+					$this->browser->name = 'Opera Mobile';
+					$this->browser->mode = 'desktop';
+
+					$this->device->type = TYPE_MOBILE;
+
+					$this->os->name = null;
+					$this->os->version = null;
+				}
+
+				if (preg_match('/Linux zvav/', $ua)) {
+					$this->browser->name = 'Opera Mini';
+					$this->browser->version = null;
+					$this->browser->mode = 'desktop';
+
+					$this->device->type = TYPE_MOBILE;
+
+					$this->os->name = null;
+					$this->os->version = null;
+				}
+				
+				if ($this->device->type == '') {
+					$this->device->type = TYPE_DESKTOP;
+				}
+			}
+
 			/****************************************************
 			 *		wOSBrowser
 			 */
@@ -5444,6 +6402,8 @@ function analyseUserAgent($ua) {
 			if (preg_match('/UCWEB/', $ua)) {
 				$this->browser->stock = false;
 				$this->browser->name = 'UC Browser';
+
+				unset($this->browser->channel);
 				
 				if (preg_match('/UCWEB\/?([0-9]*[.][0-9]*)/', $ua, $match)) {
 					$this->browser->version = new Version(array('value' => $match[1], 'details' => 3));
@@ -5473,6 +6433,8 @@ function analyseUserAgent($ua) {
 			if (preg_match('/ucweb-squid/', $ua)) {
 				$this->browser->stock = false;
 				$this->browser->name = 'UC Browser';
+
+				unset($this->browser->channel);
 			}
 
 			if (preg_match('/\) UC /', $ua)) {
@@ -5498,6 +6460,8 @@ function analyseUserAgent($ua) {
 				$this->browser->name = 'UC Browser';
 				$this->browser->version = new Version(array('value' => $match[1], 'details' => 2));
 
+				unset($this->browser->channel);
+
 				if (!$this->device->type) {
 					$this->device->type = TYPE_MOBILE;
 				}
@@ -5594,6 +6558,7 @@ function analyseUserAgent($ua) {
 			if (preg_match('/Puffin\/([0-9.]*)/', $ua, $match)) {
 				$this->browser->name = 'Puffin';
 				$this->browser->version = new Version(array('value' => $match[1], 'details' => 2));
+				$this->browser->mode = 'proxy';
 				$this->browser->channel = '';
 				
 				$this->device->type = TYPE_MOBILE;
@@ -5645,7 +6610,8 @@ function analyseUserAgent($ua) {
 		
 			if (preg_match('/Maxthon[\/\' ]([0-9.]*)/', $ua, $match)) {
 				$this->browser->name = 'Maxthon';
-				$this->browser->version = new Version(array('value' => $match[1], 'details' => 2));
+				$this->browser->version = new Version(array('value' => $match[1], 'details' => 3));
+				$this->browser->channel = '';
 				
 				if ($this->os->name == 'Windows' && $this->browser->version->toFloat() < 4) {
 					$this->browser->version->details = 1;
@@ -5675,7 +6641,6 @@ function analyseUserAgent($ua) {
 				array('name' => 'UWebKit',				'regexp' => '/UWebKit\/([0-9.]*)/'),
 				
 				array('name' => 'PhantomJS',			'regexp' => '/PhantomJS\/([0-9.]*)/'),
-				array('name' => 'Google Web Preview',	'regexp' => '/Google Web Preview/'),
 				
 				array('name' => 'Google Earth',			'regexp' => '/Google Earth\/([0-9.]*)/'),
 				array('name' => 'EA Origin',			'regexp' => '/Origin\/([0-9.]*)/'),
@@ -5683,7 +6648,8 @@ function analyseUserAgent($ua) {
 				array('name' => 'Valve Steam',			'regexp' => '/Valve Steam/'),
 				
 				array('name' => 'Songbird',				'regexp' => '/Songbird\/([0-9.]*)/'),
-				array('name' => 'Thunderbird',			'regexp' => '/Thunderbird\/([0-9.]*)/', 'type' => TYPE_DESKTOP),
+				array('name' => 'Thunderbird',			'regexp' => '/Thunderbird[\/ ]([0-9.]*)/', 'type' => TYPE_DESKTOP),
+				array('name' => 'Microsoft Outlook',	'regexp' => '/Microsoft Outlook IMO, Build ([0-9.]*)/', 'details' => 2, 'type' => TYPE_DESKTOP),
 				
 				array('name' => '360 Extreme Explorer',	'regexp' => '/QIHU 360EE/', 'type' => TYPE_DESKTOP),
 				array('name' => '360 Safe Explorer',	'regexp' => '/QIHU 360SE/', 'type' => TYPE_DESKTOP),
@@ -5691,6 +6657,7 @@ function analyseUserAgent($ua) {
 				array('name' => '360 Phone Browser',	'regexp' => '/360 Aphone Browser \(Version ([0-9.]*)\)/'),
 				array('name' => 'ABrowse',				'regexp' => '/A[Bb]rowse ([0-9.]*)/'),
 				array('name' => 'Abrowser',				'regexp' => '/Abrowser\/([0-9.]*)/'),
+				array('name' => 'AltiBrowser',			'regexp' => '/AltiBrowser\/([0-9.]*)/i'),
 				array('name' => 'arora',				'regexp' => '/[Aa]rora\/([0-9.]*)/'),
 				array('name' => 'Avant Browser',		'regexp' => '/Avant TriCore/'),
 				array('name' => 'Baidu Browser',		'regexp' => '/M?BaiduBrowser\/([0-9.]*)/i'),
@@ -5727,10 +6694,12 @@ function analyseUserAgent($ua) {
 				array('name' => 'Jumanji', 				'regexp' => '/jumanji/'),
 				array('name' => 'Kazehakase', 			'regexp' => '/Kazehakase\/([0-9.]*)/'),
 				array('name' => 'KChrome', 				'regexp' => '/KChrome\/([0-9.]*)/', 'details' => 3),
+				array('name' => 'Kiosk', 				'regexp' => '/Kiosk\/([0-9.]*)/'),
 				array('name' => 'K-Meleon', 			'regexp' => '/K-Meleon\/([0-9.]*)/', 'type' => TYPE_DESKTOP),
 				array('name' => 'Leechcraft', 			'regexp' => '/Leechcraft(?:\/([0-9.]*))?/', 'details' => 2),
 				array('name' => 'Lightning', 			'regexp' => '/Lightning\/([0-9.]*)/'),
 				array('name' => 'Lunascape', 			'regexp' => '/Lunascape[\/| ]([0-9.]*)/', 'details' => 3),
+				array('name' => 'Lynx', 				'regexp' => '/Lynx\/([0-9.]*)/'),
 				array('name' => 'iLunascape', 			'regexp' => '/iLunascape\/([0-9.]*)/', 'details' => 3),
 				array('name' => 'Intermec Browser', 	'regexp' => '/Intermec\/([0-9.]*)/', 'details' => 2),
 				array('name' => 'MaCross Mobile', 		'regexp' => '/MaCross\/([0-9.]*)/'),
@@ -5738,12 +6707,12 @@ function analyseUserAgent($ua) {
 				array('name' => 'MixShark', 			'regexp' => '/MixShark\/([0-9.]*)/'),
 				array('name' => 'Motorola WebKit', 		'regexp' => '/MotorolaWebKit(?:\/([0-9.]*))?/', 'details' => 3),
 				array('name' => 'NetFront LifeBrowser', 'regexp' => '/NetFrontLifeBrowser\/([0-9.]*)/'),
+				array('name' => 'NetPositive', 			'regexp' => '/NetPositive\/([0-9.]*)/'),
 				array('name' => 'Netscape Navigator', 	'regexp' => '/Navigator\/([0-9.]*)/', 'details' => 3),
 				array('name' => 'Odyssey', 				'regexp' => '/OWB\/([0-9.]*)/'),
 				array('name' => 'OmniWeb', 				'regexp' => '/OmniWeb/', 'type' => TYPE_DESKTOP),
 				array('name' => 'OneBrowser', 			'regexp' => '/OneBrowser\/([0-9.]*)/'),
 				array('name' => 'Orca', 				'regexp' => '/Orca\/([0-9.]*)/'),
-				array('name' => 'Open Sankoré', 		'regexp' => '/Open-Sankore\/([0-9.]*)/'),
 				array('name' => 'Origyn', 				'regexp' => '/Origyn Web Browser/'),
 				array('name' => 'Palemoon', 			'regexp' => '/Pale[mM]oon\/([0-9.]*)/'),
 				array('name' => 'Phantom', 				'regexp' => '/Phantom\/V([0-9.]*)/'),
@@ -5756,7 +6725,7 @@ function analyseUserAgent($ua) {
 				array('name' => 'QupZilla', 			'regexp' => '/QupZilla\/([0-9.]*)/', 'type' => TYPE_DESKTOP),
 				array('name' => 'Roccat', 				'regexp' => '/Roccat\/([0-9]\.[0-9.]*)/'),
 				array('name' => 'Raven for Mac', 		'regexp' => '/Raven for Mac\/([0-9.]*)/'),
-				array('name' => 'rekonq', 				'regexp' => '/rekonq/', 'type' => TYPE_DESKTOP),
+				array('name' => 'rekonq', 				'regexp' => '/rekonq(?:\/([0-9.]*))?/', 'type' => TYPE_DESKTOP),
 				array('name' => 'RockMelt', 			'regexp' => '/RockMelt\/([0-9.]*)/', 'details' => 2),
 				array('name' => 'Sleipnir', 			'regexp' => '/Sleipnir\/([0-9.]*)/', 'details' => 3),
 				array('name' => 'SMBrowser', 			'regexp' => '/SMBrowser/'),
@@ -5776,10 +6745,27 @@ function analyseUserAgent($ua) {
 				array('name' => 'Wavelink Velocity',	'regexp' => '/Wavelink Velocity Browser\/([0-9.]*)/', 'details' => 2),
 				array('name' => 'WebPositive', 			'regexp' => '/WebPositive/'),
 				array('name' => 'WebRender', 			'regexp' => '/WebRender/'),
+				array('name' => 'Webster', 				'regexp' => '/Webster ([0-9.]*)/'),
 				array('name' => 'Wyzo', 				'regexp' => '/Wyzo\/([0-9.]*)/', 'details' => 3),
 				array('name' => 'Yandex Browser', 		'regexp' => '/YaBrowser\/([0-9.]*)/', 'details' => 2),
+				array('name' => 'YRC Weblink', 			'regexp' => '/YRCWeblink\/([0-9.]*)/'),
 				array('name' => 'Zetakey', 				'regexp' => '/Zetakey Webkit\/([0-9.]*)/'),
-				array('name' => 'Zetakey', 				'regexp' => '/Zetakey\/([0-9.]*)/')
+				array('name' => 'Zetakey', 				'regexp' => '/Zetakey\/([0-9.]*)/'),
+				
+				array('name' => 'McAfee Web Gateway', 	'regexp' => '/Webwasher\/([0-9.]*)/'),
+				
+				array('name' => 'Open Sankoré', 		'regexp' => '/Open-Sankore\/([0-9.]*)/', 'type' => TYPE_WHITEBOARD),
+				array('name' => 'Coship MMCP', 			'regexp' => '/Coship_MMCP_([0-9.]*)/', 'type' => TYPE_SIGNAGE),
+				
+				array('name' => '80legs', 				'regexp' => '/008\/([0-9.]*)/', 'type' => TYPE_BOT),
+				array('name' => 'Ask Jeeves', 			'regexp' => '/Ask Jeeves\/Teoma/', 'type' => TYPE_BOT),
+				array('name' => 'Baiduspider', 			'regexp' => '/Baiduspider\/([0-9.]*)/', 'type' => TYPE_BOT),
+				array('name' => 'Bloglines', 			'regexp' => '/Bloglines\/([0-9.]*)/', 'type' => TYPE_BOT),
+				array('name' => 'Googlebot', 			'regexp' => '/Googlebot\/([0-9.]*)/', 'type' => TYPE_BOT),
+				array('name' => 'Google Web Preview',	'regexp' => '/Google Web Preview/', 'type' => TYPE_BOT),
+				array('name' => 'Google Font Analysis', 'regexp' => '/Google-FontAnalysis\/([0-9.]*)/', 'type' => TYPE_BOT),
+				array('name' => 'HeartRails Capture', 	'regexp' => '/HeartRails_Capture\/([0-9.]*)/', 'type' => TYPE_BOT),
+				array('name' => 'Wget', 				'regexp' => '/Wget\/([0-9.]*)/', 'type' => TYPE_BOT)
 			);
 
 			for ($b = 0; $b < count($browsers); $b++) {
@@ -5788,7 +6774,7 @@ function analyseUserAgent($ua) {
 					$this->browser->channel = '';
 					$this->browser->stock = false;
 
-					if ($match[1]) {
+					if (isset($match[1]) && $match[1]) {
 						$this->browser->version = new Version(array('value' => $match[1], 'details' => isset($browsers[$b]['details']) ? $browsers[$b]['details'] : null));
 					} else {
 						$this->browser->version = null;
@@ -5916,7 +6902,7 @@ function analyseUserAgent($ua) {
 			}
 				
 			
-			if ($this->device->type == TYPE_TELEVISION && $this->browser->name == 'Opera') {
+			if (isset($this->browser->name) && $this->browser->name == 'Opera' && $this->device->type == TYPE_TELEVISION) {
 				$this->browser->name = 'Opera Devices';
 				
 				if (preg_match('/Presto\/([0-9]+\.[0-9]+)/', $ua, $match)) {
@@ -5979,6 +6965,16 @@ function analyseUserAgent($ua) {
 				}
 			}
 			
+			
+			/* If we have a Mozilla browser and not engine or other browser name, it could be the original */
+			if (preg_match('/Mozilla/', $ua) && !isset($this->browser->name) && !isset($this->engine->name)) {
+				$this->browser->name = 'Netscape';
+
+				if (preg_match('/Mozilla\/([0-9.]*)/i', $ua, $match)) {
+					$this->browser->version = new Version(array('value' => $match[1]));
+				}
+			}
+			
 		}
 		
 		function toJavaScript() {

From 2bb70407e736e8ad064ec37548fbb9cb2284f8ec Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 10:50:08 +0200
Subject: [PATCH 105/174] Forgot to update browser.html with the new UA lib

---
 backend/templates/browser.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/templates/browser.html b/backend/templates/browser.html
index 0133f29a..821f20bd 100644
--- a/backend/templates/browser.html
+++ b/backend/templates/browser.html
@@ -19,7 +19,7 @@
 		<script src='/scripts/engine.js' type='text/javascript'></script>
 		<script src='/scripts/template.js' type='text/javascript'></script>
 		<script src='/scripts/reporting.js' type='text/javascript'></script>
-		<script src='/scripts/useragents.js' type='text/javascript'></script>
+		<script src='/scripts/useragents/detect.js?<?php echo preg_replace('/([ ])/e', 'chr(rand(97,122))', '        '); ?>' type='text/javascript'></script>
 
 		<link rel="icon" href="/images/icon.png">
 		<link rel="apple-touch-icon" href="/images/button.png">
@@ -65,7 +65,7 @@ <h3 data-i18n>About these scores</h3>
 				<script>
 				<!--
 				
-					Browsers = new UserAgents(navigator.userAgent, {
+					Browsers = new UserAgents({
 						useFeatures:		true,
 						detectCamouflage:	true
 					});

From 5c4b834a188dfea1716ab51284c33f74e385fe49 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 10:50:50 +0200
Subject: [PATCH 106/174] Remove chromeframe trigger

---
 index.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/index.html b/index.html
index 01f0d7c2..905028ac 100644
--- a/index.html
+++ b/index.html
@@ -6,7 +6,6 @@
 
 		<meta charset="UTF-8">
 		
-		<meta http-equiv="X-UA-Compatible" content="chrome=1">
 		<meta name="apple-mobile-web-app-capable" content="yes">
 		<meta name="apple-mobile-web-app-status-bar-style" content="black">
 		<meta name="viewport" content="width=device-width; initial-scale=1.0">

From 558e529cce0907cccafa0df72d235abcbe405b6a Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 10:51:37 +0200
Subject: [PATCH 107/174] Add deviceIdentified info the data

---
 index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/index.html b/index.html
index 905028ac..e06585d9 100644
--- a/index.html
+++ b/index.html
@@ -412,6 +412,7 @@ <h2>
 							  '"deviceManufacturer": "' + (Browsers.device.manufacturer ? Browsers.device.manufacturer : '') + '",' +
 							  '"deviceModel": "' + (Browsers.device.model ? Browsers.device.model : '') + '",' +
 							  '"deviceType": "' + (Browsers.device.type ? Browsers.device.type : '') + '",' +
+							  '"deviceIdentified": "' + (Browsers.device.identified ? '1' : '0' ) + '",' +
 							  '"deviceWidth": "' + (Browsers.device.type != 'desktop' ? screen.width : '') + '",' +
 							  '"deviceHeight": "' + (Browsers.device.type != 'desktop' ? screen.height : '') + '",' +
 							  '"useragent": "' + navigator.userAgent + '",' +

From 509e97dd27a761a9736dfc1c054f59dd7ee43574 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 10:52:14 +0200
Subject: [PATCH 108/174] Display table after submitting data

---
 index.html | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/index.html b/index.html
index e06585d9..6f1ebf41 100644
--- a/index.html
+++ b/index.html
@@ -365,29 +365,6 @@ <h2>
 					onReport:	function() { submit('report', '{"uniqueid": "' + r.uniqueid + '"}'); }
 				});
 				
-				/* Show detailed report of scores */
-				var div = document.createElement('div');
-				div.className = 'resultsTable';
-				results.appendChild(div);
-				
-				var table = new FeatureTable({
-					parent:			div, 
-					tests:			tests,
-					header:			false,
-					links:			true,
-					explainations: 	true,
-					grading:		true,
-					bonus:			true,
-					columns:		1
-				});
-
-				table.updateColumn(0, r);
-
-				var div = document.createElement('div');
-				div.className = 'uniqueid';
-				div.innerHTML = 'id: ' + r.uniqueid;
-				results.appendChild(div);
-				
 				/* Submit results */
 				var payload = '{' +
 							  '"version": "4",' +
@@ -422,7 +399,30 @@ <h2>
 							  '}';
 				
 				submit('submit', payload);
-					
+				
+				/* Show detailed report of scores */
+				var div = document.createElement('div');
+				div.className = 'resultsTable';
+				results.appendChild(div);
+				
+				var table = new FeatureTable({
+					parent:			div, 
+					tests:			tests,
+					header:			false,
+					links:			true,
+					explainations: 	true,
+					grading:		true,
+					bonus:			true,
+					columns:		1
+				});
+
+				table.updateColumn(0, r);
+
+				var div = document.createElement('div');
+				div.className = 'uniqueid';
+				div.innerHTML = 'id: ' + r.uniqueid;
+				results.appendChild(div);
+
 				function submit(method, payload) {
 					var httpRequest;
 					if (window.XMLHttpRequest) {

From b09151de3c2ac6a6f69eaca80238117a0c842e09 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 10:53:25 +0200
Subject: [PATCH 109/174] Change navigation text

---
 index.html               | 4 ++--
 translations/cn/index.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/index.html b/index.html
index 6f1ebf41..0b459f3c 100644
--- a/index.html
+++ b/index.html
@@ -80,12 +80,12 @@ <h1 data-i18n>The HTML5 test <em>&ndash; how well does your browser support HTML
 			<div class='navigation'>
 				<ul class='left'>
 					<li class='selected'><a href='/index.html' data-i18n>Your browser</a></li>
-					<li><a href='/results/desktop.html' data-i18n>Other<span> browser</span>s</a></li>
+					<li><a href='/results/desktop.html' data-i18n>Other browsers</a></li>
 					<li><a href='/compare/browser/index.html' data-i18n>Compare</a></li>
 				</ul>
 				<ul class='right'>
 					<li><a href='http://blog.html5test.com/' data-i18n>News</a></li>
-					<li><a href='/about.html' data-i18n>About<span> the test</span></a></li>
+					<li><a href='/about.html' data-i18n>About the test</a></li>
 				</ul>
 			</div>
 		</div>
diff --git a/translations/cn/index.js b/translations/cn/index.js
index 025326f6..2ab04fca 100644
--- a/translations/cn/index.js
+++ b/translations/cn/index.js
@@ -3,9 +3,9 @@ var translation = {
 	'The HTML5 test <em>– how well does your browser support HTML5?</em>': 'HTML5测试 <em>– 你的浏览器能有多好的支持HTML5?</em>',
 
 	'Your browser':								'你的浏览器',
-	'Other<span> browser</span>s':				'其他浏览器',
+	'Other browsers':							'其他浏览器',
 	'Compare':									'比较',
-	'About<span> the test</span>':				'关于测试',
+	'About the test':							'关于测试',
 
 	'Your browser scores': 						'你的浏览器分数',
 	'and no bonus points':						'额外奖励分 {{bonus}} 分',

From 54c87ee4ce1603526757ea4bbbed7341871c923c Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 10:56:18 +0200
Subject: [PATCH 110/174] Add popup table for extra info about a test

---
 css/main.css         | 28 ++++++++++++++++++++++++++++
 scripts/reporting.js |  4 ++++
 2 files changed, 32 insertions(+)

diff --git a/css/main.css b/css/main.css
index a7638a8b..5e827bad 100644
--- a/css/main.css
+++ b/css/main.css
@@ -1277,6 +1277,16 @@ body {
 
 	width: 200px;
 }
+.comparisonTable #table-header #row-header td .information .popup {
+	left: -98px;
+	top: 100px;
+	width: 300px;
+}
+.comparisonTable #table-header #row-header td:hover .information .popup {
+	display: block;
+}
+
+
 .comparisonTable #table-header #row-header td .popup.visible {
 	display: block;
 }
@@ -1299,6 +1309,24 @@ body {
 	overflow-y: scroll;
 	-webkit-overflow-scrolling: touch;	
 }
+.comparisonTable #table-header #row-header td .information .popup > div {
+	padding: 20px;
+	height: auto;
+}
+.comparisonTable #table-header #row-header td .popup table {
+	margin: 0;
+}
+
+.comparisonTable #table-header #row-header td .popup table td,
+.comparisonTable #table-header #row-header td .popup table th {
+	border: 1px solid #ddd;
+	width: auto;
+	height: auto;
+	vertical-align: top;
+	text-align: left;
+	padding: 10px;
+}
+
 .comparisonTable #table-header #row-header td .popup ul {
 	-webkit-transform: translate3d(0,0,0);
 	width: 200px;
diff --git a/scripts/reporting.js b/scripts/reporting.js
index aed1af0b..620a6656 100644
--- a/scripts/reporting.js
+++ b/scripts/reporting.js
@@ -195,6 +195,10 @@
 				var cell = row.childNodes[column + 1];
 				cell.className = '';
 				cell.firstChild.firstChild.innerHTML = '<span class="nickname">' + t(data.nickname) + '</span><span class="score">' + data.score + '</span><span class="bonus">' + data.bonus + ' ' + t('bonus points') + '</span>';
+				
+				if (typeof data.useragent != 'undefined') {
+					cell.firstChild.firstChild.innerHTML += '<div class="information"><div class="popup"><div><table><tbody><tr><th>Identification</th><td>' + data.humanReadable + '</td></tr><tr><th>Useragent</th><td>' + data.useragent + '</td></tr><tr><th>Screen size</th><td>' + data.deviceWidth + ' x ' + data.deviceHeight + '</td></tr></tbody></table></div></div></div>';
+				}
 			}
 			
 			for (var i = 0; i < this.tests.length; i++) {

From b9b910bd73a4f658c7775e5f90aa489ba594ae7c Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 10:57:21 +0200
Subject: [PATCH 111/174] Change the way grades are shown

---
 css/main.css         | 15 +++++++++------
 scripts/reporting.js |  4 ++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/css/main.css b/css/main.css
index 5e827bad..d28038f0 100644
--- a/css/main.css
+++ b/css/main.css
@@ -735,14 +735,15 @@ body {
 	background: #f0f0f0 linear-gradient(top, #e6e6e6, #f6f6f6 43px, #d6d6d6 43px, #f0f0f0);
 }
 .resultsTable table thead th {
-	padding: 3px 10px;
+	padding: 0px 10px;
+	height: 44px;
 	
 	font-size: 1.1em;
 	text-align: left;
-	height: 38px;
 }
 .resultsTable table thead td {
-	padding: 3px 10px;
+	padding: 0px 10px;
+	width: 44px;
 	
 	font-family: 'Alfa Slab One', Arial;
 	font-weight: normal;
@@ -750,12 +751,14 @@ body {
 	font-size: 1.8em;
 	text-align: right;
 	color: #999;
-	width: 50px;
+}
+.resultsTable table thead td > div {
+	position: relative;
 }
 .resultsTable table thead td div.grade {
 	position: absolute;
-	right: 10px;
-	top: 4px;
+	right: 0px;
+	top: -18px;
 }
 .resultsTable table thead td span.none {
 	color: #853333;
diff --git a/scripts/reporting.js b/scripts/reporting.js
index 620a6656..06909870 100644
--- a/scripts/reporting.js
+++ b/scripts/reporting.js
@@ -217,7 +217,7 @@
 						var row = document.getElementById('head-' + tests[i].id);
 						var cell = row.childNodes[column + 1];
 						
-						var content = "<div class='grade'>";
+						var content = "<div><div class='grade'>";
 						
 						if (this.options.bonus && bonus > 0) {
 							content += "<span class='bonus'>+" + bonus + "<span> " + t('bonus points') + "</span></span>";
@@ -242,7 +242,7 @@
 							content += "<span>" + points + "</span>";
 						}
 
-						content += "</div>"
+						content += "</div></div>";
 						
 						cell.innerHTML = content;
 						this.updateItems(column, data, 0, this.tests[i].id, this.tests[i].items);

From 34aa9352916db69a57eac2467a7d662b652f297a Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 10:58:04 +0200
Subject: [PATCH 112/174] Add text about donating

---
 css/main.css |  6 +++++-
 index.html   | 11 +++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/css/main.css b/css/main.css
index d28038f0..55920520 100644
--- a/css/main.css
+++ b/css/main.css
@@ -229,10 +229,14 @@ body {
 	-ms-box-shadow: inset 0 3px 10px rgba(0,0,0,0.3);
 	-o-box-shadow: inset 0 3px 10px rgba(0,0,0,0.3);
 	box-shadow: inset 0 3px 10px rgba(0,0,0,0.3);
+
+	color: #ddd;
+	font-size: 0.75em;
+	line-height: 150%;
 }
 .ads > p {
 	text-transform: uppercase;
-	font-size: 0.6em !important;
+	font-size: 0.8em !important;
 	text-align: center;
 	letter-spacing: 0.8em;
 	
diff --git a/index.html b/index.html
index 0b459f3c..3d55486a 100644
--- a/index.html
+++ b/index.html
@@ -161,6 +161,17 @@ <h2>
 						The maximum number of points that can be scored is <span id='total'>0</span> at this moment, but this is a moving goalpost.
 					</p>
 					
+					<div class='ads'>
+						<strong>Help us improve<br>HTML5 test by donating</strong><br> 
+						This will allow us to spend more time on HTML5test.com and acquire more devices for our testing lab.<br><br>						
+						<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+						<input type="hidden" name="cmd" value="_s-xclick">
+						<input type="hidden" name="hosted_button_id" value="9DNBJPQFEHYSC">
+						<input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
+						<img alt="" border="0" src="https://www.paypalobjects.com/nl_NL/i/scr/pixel.gif" width="1" height="1">
+						</form>
+					</div>
+
 					<p data-i18n='index-intro-6'> 
 						The HTML5 test is created by Niels Leenheer. Visit my website at <a href='http://rakaz.nl'>rakaz.nl</a> or follow me on <a href='http://twitter.com/rakaz'>twitter</a>.
 					</p>

From 7dab27dc8664d0c86c486ec9bf89e190dac02015 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 10:58:39 +0200
Subject: [PATCH 113/174] Change text about donating

---
 donate.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/donate.html b/donate.html
index 84fcab68..856f61f0 100644
--- a/donate.html
+++ b/donate.html
@@ -129,9 +129,10 @@ <h3>Devices</h3>
 							older devices for testing historic versions. 
 						</p>
 						<p>
-							We already have various phones and tablets running Android (2.1 to 4.0) and iOS (5.0 and 5.1) to our disposal.
+							We already have various phones and tablets running Android (2.1 to 4.1), BlackBerry (Legacy 7.1, 
+							Tablet OS 2.1 and BB10), iOS (5.0 and 6.0) and Windows Phone (7.5) to our disposal.
 							We are looking for devices running older versions of iOS or Android, and devices running different 
-							operating systems, such as BlackBerry, S60, Windows Mobile or Windows Phone. If you have a new or used 
+							operating systems, such as S60, Windows Mobile or Windows Phone 8. If you have a new or used 
 							device you want to donate to our lab, please contact me on 
 							<a href='https://github.com/NielsLeenheer'>Github</a> or <a href='http://twitter.com/rakaz'>Twitter</a>.
 						</p>

From 2dcdd21127b499ad4e419a812af5bf53a464187b Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 10:59:50 +0200
Subject: [PATCH 114/174] Updated URLs to match new location of certain
 sections of the HTML5 spec

---
 scripts/data.js | 298 ++++++++++++++++++++++++------------------------
 1 file changed, 149 insertions(+), 149 deletions(-)

diff --git a/scripts/data.js b/scripts/data.js
index 698644b2..88a55db4 100644
--- a/scripts/data.js
+++ b/scripts/data.js
@@ -11,14 +11,14 @@ var tests = [
 						id:		'tokenizer',
 						name: 	'HTML5 tokenizer', 
 						urls:	{
-									'w3c':	'http://www.w3.org/TR/html5/parsing.html',
+									'w3c':	'http://www.w3.org/TR/html5/syntax.html#parsing',
 									'mdn':	'/HTML/HTML5/HTML5_Parser'
 								}
 					}, {
 						id:		'tree',
 						name: 	'HTML5 tree building', 
 						urls:	{
-									'w3c':	'http://www.w3.org/TR/html5/parsing.html',
+									'w3c':	'http://www.w3.org/TR/html5/syntax.html#parsing',
 									'mdn':	'/HTML/HTML5/HTML5_Parser'
 								}
 					}, 
@@ -29,7 +29,7 @@ var tests = [
 						id:		'svg',
 						name: 	'SVG in <code>text/html</code>', 
 						url2:	{
-									'w3c':	'http://www.w3.org/TR/html5/the-map-element.html#svg-0',
+									'w3c':	'http://www.w3.org/TR/html5/embedded-content-0.html#svg',
 									'mdn':	'/SVG'
 								}
 								
@@ -37,7 +37,7 @@ var tests = [
 						id:		'mathml',
 						name: 	'MathML in <code>text/html</code>', 
 						urls:	{
-									'w3c':	'http://www.w3.org/TR/html5/the-map-element.html#mathml',
+									'w3c':	'http://www.w3.org/TR/html5/embedded-content-0.html#mathml',
 									'mdn':	'/MathML'
 								}
 					}
@@ -50,7 +50,7 @@ var tests = [
 						id:		'element',
 						name: 	'<code>canvas</code> element', 
 						urls:	{
-									'w3c':	'http://www.w3.org/TR/html5/the-canvas-element.html#the-canvas-element',
+									'w3c':	'http://www.w3.org/TR/html5/embedded-content-0.html#the-canvas-element',
 									'wp': 	'/canvas',
 									'mdn':	'/HTML/Canvas'
 								}
@@ -76,18 +76,18 @@ var tests = [
 						id:		'element',
 						name: 	'<code>video</code> element', 
 						urls:	{
-									'w3c':	'http://www.w3.org/TR/html5/the-iframe-element.html#the-video-element',
+									'w3c':	'http://www.w3.org/TR/html5/embedded-content-0.html#the-video-element',
 									'wp': 	'/html/elements/video',
 									'mdn':	'/Using_HTML5_audio_and_video'
 								}
 					}, {
 						id:		'subtitle',
 						name: 	'Subtitle support', 
-						url:	'http://www.w3.org/TR/html5/the-iframe-element.html#the-track-element'
+						url:	'http://www.w3.org/TR/html5/embedded-content-0.html#the-track-element'
 					}, {
 						id:		'poster',
 						name: 	'Poster image support', 
-						url:	'http://www.w3.org/TR/html5/the-iframe-element.html#dom-video-poster'
+						url:	'http://www.w3.org/TR/html5/embedded-content-0.html#attr-video-poster'
 					}, 
 					
 					'<em>The following tests go beyond the requirements of the HTML5 specification and are not counted towards the total score. If browser support for one or more video codecs is detected, two bonus points are awarded for each codec.</em>',
@@ -114,7 +114,7 @@ var tests = [
 						id:		'element',
 						name: 	'<code>audio</code> element', 
 						urls:	{
-									'w3c':	'http://www.w3.org/TR/html5/the-iframe-element.html#the-audio-element',
+									'w3c':	'http://www.w3.org/TR/html5/embedded-content-0.html#the-audio-element',
 									'wp': 	'/html/elements/audio',
 									'mdn':	'/Using_HTML5_audio_and_video'
 								}
@@ -150,7 +150,7 @@ var tests = [
 						id:		'dataset',
 						name: 	'Embedding custom non-visible data', 
 						urls:	{
-									'w3c':	'http://www.w3.org/TR/html5/elements.html#dom-dataset',
+									'w3c':	'http://www.w3.org/TR/html5/dom.html#embedding-custom-non-visible-data-with-the-data-*-attributes',
 									'mdn':	'/DOM/element.dataset'
 								}
 					}, 
@@ -291,11 +291,11 @@ var tests = [
 									{
 										id:		'outerHTML',
 										name: 	'<code>outerHTML</code> property', 
-										url:	'http://www.w3.org/TR/html5/apis-in-html-documents.html#outerhtml'
+										url:	'http://domparsing.spec.whatwg.org/#outerhtml'
 									}, {
 										id:		'insertAdjacentHTML',
 										name: 	'<code>insertAdjacentHTML</code> function', 
-										url:	'http://www.w3.org/TR/html5/apis-in-html-documents.html#dom-insertadjacenthtml'
+										url:	'http://domparsing.spec.whatwg.org/#insertadjacenthtml%28%29'
 									}
 								]
 					}
@@ -325,7 +325,7 @@ var tests = [
 									{
 										id:			'element',
 										name: 		'Minimal element support', 
-										url:		'http://www.w3.org/TR/html5/states-of-the-type-attribute.html#text-state-and-search-state'
+										url:		'http://www.w3.org/TR/html5/forms.html#text-(type=text)-state-and-search-state-(type=search)'
 									}
 								]
 					}, {
@@ -335,7 +335,7 @@ var tests = [
 									{
 										id:			'element',
 										name: 		'Minimal element support', 
-										url:		'http://www.w3.org/TR/html5/states-of-the-type-attribute.html#telephone-state'
+										url:		'http://www.w3.org/TR/html5/forms.html#telephone-state-(type=tel)'
 									}
 								]
 					}, {
@@ -345,11 +345,11 @@ var tests = [
 									{
 										id:			'element',
 										name: 		'Minimal element support', 
-										url:		'http://www.w3.org/TR/html5/states-of-the-type-attribute.html#url-state'
+										url:		'http://www.w3.org/TR/html5/forms.html#url-state-(type=url)'
 									}, {
 										id:			'validation',
 										name: 		'Field validation', 
-										url:		'http://www.w3.org/TR/html5/association-of-controls-and-forms.html#dom-cva-validity'
+										url:		'http://www.w3.org/TR/html5/forms.html#the-constraint-validation-api'
 									}
 								]
 					}, {
@@ -359,11 +359,11 @@ var tests = [
 									{
 										id:			'element',
 										name: 		'Minimal element support', 
-										url:		'http://www.w3.org/TR/html5/states-of-the-type-attribute.html#e-mail-state'
+										url:		'http://www.w3.org/TR/html5/forms.html#e-mail-state-(type=email)'
 									}, {
 										id:			'validation',
 										name: 		'Field validation', 
-										url:		'http://www.w3.org/TR/html5/association-of-controls-and-forms.html#dom-cva-validity'
+										url:		'http://www.w3.org/TR/html5/forms.html#the-constraint-validation-api'
 									}
 								]
 					}, {
@@ -373,42 +373,42 @@ var tests = [
 									{
 										id:			'element',
 										name: 		'Minimal element support', 
-										url:		'http://www.w3.org/TR/html5/states-of-the-type-attribute.html#date-and-time-state'
+										url:		'http://www.w3.org/TR/html5/forms.html#date-and-time-state-(type=datetime)'
 									}, {
 										id:			'ui',
 										name: 		'Custom user-interface'
 									}, {
 										id:			'sanitization',
 										name: 		'Value sanitization', 
-										url:		'http://www.w3.org/TR/html5/the-input-element.html#value-sanitization-algorithm'
+										url:		'http://www.w3.org/TR/html5/forms.html#value-sanitization-algorithm'
 									}, {
 										id:			'min',
 										name: 		'<code>min</code> attribute', 
-										url:		'http://www.w3.org/TR/html5/the-input-element.html#dom-input-min'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-input-min'
 									}, {
 										id:			'max',
 										name: 		'<code>max</code> attribute', 
-										url:		'http://www.w3.org/TR/html5/the-input-element.html#dom-input-max'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-input-max'
 									}, {
 										id:			'step',
 										name: 		'<code>step</code> attribute', 
-										url:		'http://www.w3.org/TR/html5/the-input-element.html#dom-input-step'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-input-step'
 									}, {
 										id:			'stepDown',
 										name: 		'<code>stepDown()</code> method',
-										url:		'http://www.w3.org/TR/html5/common-input-element-attributes.html#dom-input-stepdown'
+										url:		'http://www.w3.org/TR/html5/forms.html#dom-input-stepdown'
 									}, {
 										id:			'stepUp',
 										name: 		'<code>stepUp()</code> method',
-										url:		'http://www.w3.org/TR/html5/common-input-element-attributes.html#dom-input-stepup'
+										url:		'http://www.w3.org/TR/html5/forms.html#dom-input-stepup'
 									}, {
 										id:			'valueAsDate',
 										name: 		'<code>valueAsDate()</code> method',
-										url:		'http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-valueasdate'
+										url:		'http://www.w3.org/TR/html5/forms.html#dom-input-valueasdate'
 									}, {
 										id:			'valueAsNumber',
 										name: 		'<code>valueAsNumber()</code> method',
-										url:		'http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-valueasnumber'
+										url:		'http://www.w3.org/TR/html5/forms.html#dom-input-valueasnumber'
 									}
 								]
 					}, {
@@ -418,42 +418,42 @@ var tests = [
 									{
 										id:			'element',
 										name: 		'Minimal element support', 
-										url:		'http://www.w3.org/TR/html5/states-of-the-type-attribute.html#date-state'
+										url:		'http://www.w3.org/TR/html5/forms.html#date-state-(type=date)'
 									}, {
 										id:			'ui',
 										name: 		'Custom user-interface'
 									}, {
 										id:			'sanitization',
 										name: 		'Value sanitization', 
-										url:		'http://www.w3.org/TR/html5/the-input-element.html#value-sanitization-algorithm'
+										url:		'http://www.w3.org/TR/html5/forms.html#value-sanitization-algorithm'
 									}, {
 										id:			'min',
 										name: 		'<code>min</code> attribute', 
-										url:		'http://www.w3.org/TR/html5/the-input-element.html#dom-input-min'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-input-min'
 									}, {
 										id:			'max',
 										name: 		'<code>max</code> attribute', 
-										url:		'http://www.w3.org/TR/html5/the-input-element.html#dom-input-max'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-input-max'
 									}, {
 										id:			'step',
 										name: 		'<code>step</code> attribute', 
-										url:		'http://www.w3.org/TR/html5/the-input-element.html#dom-input-step'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-input-step'
 									}, {
 										id:			'stepDown',
 										name: 		'<code>stepDown()</code> method',
-										url:		'http://www.w3.org/TR/html5/common-input-element-attributes.html#dom-input-stepdown'
+										url:		'http://www.w3.org/TR/html5/forms.html#dom-input-stepdown'
 									}, {
 										id:			'stepUp',
 										name: 		'<code>stepUp()</code> method',
-										url:		'http://www.w3.org/TR/html5/common-input-element-attributes.html#dom-input-stepup'
+										url:		'http://www.w3.org/TR/html5/forms.html#dom-input-stepup'
 									}, {
 										id:			'valueAsDate',
 										name: 		'<code>valueAsDate()</code> method',
-										url:		'http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-valueasdate'
+										url:		'http://www.w3.org/TR/html5/forms.html#dom-input-valueasdate'
 									}, {
 										id:			'valueAsNumber',
 										name: 		'<code>valueAsNumber()</code> method',
-										url:		'http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-valueasnumber'
+										url:		'http://www.w3.org/TR/html5/forms.html#dom-input-valueasnumber'
 									}
 								]
 					}, {
@@ -463,42 +463,42 @@ var tests = [
 									{
 										id:			'element',
 										name: 		'Minimal element support', 
-										url:		'http://www.w3.org/TR/html5/states-of-the-type-attribute.html#month-state'
+										url:		'http://www.w3.org/TR/html5/forms.html#month-state-(type=month)'
 									}, {
 										id:			'ui',
 										name: 		'Custom user-interface'
 									}, {
 										id:			'sanitization',
 										name: 		'Value sanitization', 
-										url:		'http://www.w3.org/TR/html5/the-input-element.html#value-sanitization-algorithm'
+										url:		'http://www.w3.org/TR/html5/forms.html#value-sanitization-algorithm'
 									}, {
 										id:			'min',
 										name: 		'<code>min</code> attribute', 
-										url:		'http://www.w3.org/TR/html5/the-input-element.html#dom-input-min'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-input-min'
 									}, {
 										id:			'max',
 										name: 		'<code>max</code> attribute', 
-										url:		'http://www.w3.org/TR/html5/the-input-element.html#dom-input-max'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-input-max'
 									}, {
 										id:			'step',
 										name: 		'<code>step</code> attribute', 
-										url:		'http://www.w3.org/TR/html5/the-input-element.html#dom-input-step'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-input-step'
 									}, {
 										id:			'stepDown',
 										name: 		'<code>stepDown()</code> method',
-										url:		'http://www.w3.org/TR/html5/common-input-element-attributes.html#dom-input-stepdown'
+										url:		'http://www.w3.org/TR/html5/forms.html#dom-input-stepdown'
 									}, {
 										id:			'stepUp',
 										name: 		'<code>stepUp()</code> method',
-										url:		'http://www.w3.org/TR/html5/common-input-element-attributes.html#dom-input-stepup'
+										url:		'http://www.w3.org/TR/html5/forms.html#dom-input-stepup'
 									}, {
 										id:			'valueAsDate',
 										name: 		'<code>valueAsDate()</code> method',
-										url:		'http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-valueasdate'
+										url:		'http://www.w3.org/TR/html5/forms.html#dom-input-valueasdate'
 									}, {
 										id:			'valueAsNumber',
 										name: 		'<code>valueAsNumber()</code> method',
-										url:		'http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-valueasnumber'
+										url:		'http://www.w3.org/TR/html5/forms.html#dom-input-valueasnumber'
 									}
 								]
 					}, {
@@ -508,42 +508,42 @@ var tests = [
 									{
 										id:			'element',
 										name: 		'Minimal element support', 
-										url:		'http://www.w3.org/TR/html5/states-of-the-type-attribute.html#week-state'
+										url:		'http://www.w3.org/TR/html5/forms.html#week-state-(type=week)'
 									}, {
 										id:			'ui',
 										name: 		'Custom user-interface'
 									}, {
 										id:			'sanitization',
 										name: 		'Value sanitization', 
-										url:		'http://www.w3.org/TR/html5/the-input-element.html#value-sanitization-algorithm'
+										url:		'http://www.w3.org/TR/html5/forms.html#value-sanitization-algorithm'
 									}, {
 										id:			'min',
 										name: 		'<code>min</code> attribute', 
-										url:		'http://www.w3.org/TR/html5/the-input-element.html#dom-input-min'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-input-min'
 									}, {
 										id:			'max',
 										name: 		'<code>max</code> attribute', 
-										url:		'http://www.w3.org/TR/html5/the-input-element.html#dom-input-max'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-input-max'
 									}, {
 										id:			'step',
 										name: 		'<code>step</code> attribute', 
-										url:		'http://www.w3.org/TR/html5/the-input-element.html#dom-input-step'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-input-step'
 									}, {
 										id:			'stepDown',
 										name: 		'<code>stepDown()</code> method',
-										url:		'http://www.w3.org/TR/html5/common-input-element-attributes.html#dom-input-stepdown'
+										url:		'http://www.w3.org/TR/html5/forms.html#dom-input-stepdown'
 									}, {
 										id:			'stepUp',
 										name: 		'<code>stepUp()</code> method',
-										url:		'http://www.w3.org/TR/html5/common-input-element-attributes.html#dom-input-stepup'
+										url:		'http://www.w3.org/TR/html5/forms.html#dom-input-stepup'
 									}, {
 										id:			'valueAsDate',
 										name: 		'<code>valueAsDate()</code> method',
-										url:		'http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-valueasdate'
+										url:		'http://www.w3.org/TR/html5/forms.html#dom-input-valueasdate'
 									}, {
 										id:			'valueAsNumber',
 										name: 		'<code>valueAsNumber()</code> method',
-										url:		'http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-valueasnumber'
+										url:		'http://www.w3.org/TR/html5/forms.html#dom-input-valueasnumber'
 									}
 								]
 					}, {
@@ -553,42 +553,42 @@ var tests = [
 									{
 										id:			'element',
 										name: 		'Minimal element support', 
-										url:		'http://www.w3.org/TR/html5/states-of-the-type-attribute.html#time-state'
+										url:		'http://www.w3.org/TR/html5/forms.html#time-state-(type=time)'
 									}, {
 										id:			'ui',
 										name: 		'Custom user-interface'
 									}, {
 										id:			'sanitization',
 										name: 		'Value sanitization', 
-										url:		'http://www.w3.org/TR/html5/the-input-element.html#value-sanitization-algorithm'
+										url:		'http://www.w3.org/TR/html5/forms.html#value-sanitization-algorithm'
 									}, {
 										id:			'min',
 										name: 		'<code>min</code> attribute', 
-										url:		'http://www.w3.org/TR/html5/the-input-element.html#dom-input-min'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-input-min'
 									}, {
 										id:			'max',
 										name: 		'<code>max</code> attribute', 
-										url:		'http://www.w3.org/TR/html5/the-input-element.html#dom-input-max'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-input-max'
 									}, {
 										id:			'step',
 										name: 		'<code>step</code> attribute', 
-										url:		'http://www.w3.org/TR/html5/the-input-element.html#dom-input-step'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-input-step'
 									}, {
 										id:			'stepDown',
 										name: 		'<code>stepDown()</code> method',
-										url:		'http://www.w3.org/TR/html5/common-input-element-attributes.html#dom-input-stepdown'
+										url:		'http://www.w3.org/TR/html5/forms.html#dom-input-stepdown'
 									}, {
 										id:			'stepUp',
 										name: 		'<code>stepUp()</code> method',
-										url:		'http://www.w3.org/TR/html5/common-input-element-attributes.html#dom-input-stepup'
+										url:		'http://www.w3.org/TR/html5/forms.html#dom-input-stepup'
 									}, {
 										id:			'valueAsDate',
 										name: 		'<code>valueAsDate()</code> method',
-										url:		'http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-valueasdate'
+										url:		'http://www.w3.org/TR/html5/forms.html#dom-input-valueasdate'
 									}, {
 										id:			'valueAsNumber',
 										name: 		'<code>valueAsNumber()</code> method',
-										url:		'http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-valueasnumber'
+										url:		'http://www.w3.org/TR/html5/forms.html#dom-input-valueasnumber'
 									}
 								]
 					}, {
@@ -598,38 +598,38 @@ var tests = [
 									{
 										id:			'element',
 										name: 		'Minimal element support', 
-										url:		'http://www.w3.org/TR/html5/states-of-the-type-attribute.html#local-date-and-time-state'
+										url:		'http://www.w3.org/TR/html5/forms.html#local-date-and-time-state-(type=datetime-local)'
 									}, {
 										id:			'ui',
 										name: 		'Custom user-interface'
 									}, {
 										id:			'sanitization',
 										name: 		'Value sanitization', 
-										url:		'http://www.w3.org/TR/html5/the-input-element.html#value-sanitization-algorithm'
+										url:		'http://www.w3.org/TR/html5/forms.html#value-sanitization-algorithm'
 									}, {
 										id:			'min',
 										name: 		'<code>min</code> attribute', 
-										url:		'http://www.w3.org/TR/html5/the-input-element.html#dom-input-min'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-input-min'
 									}, {
 										id:			'max',
 										name: 		'<code>max</code> attribute', 
-										url:		'http://www.w3.org/TR/html5/the-input-element.html#dom-input-max'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-input-max'
 									}, {
 										id:			'step',
 										name: 		'<code>step</code> attribute', 
-										url:		'http://www.w3.org/TR/html5/the-input-element.html#dom-input-step'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-input-step'
 									}, {
 										id:			'stepDown',
 										name: 		'<code>stepDown()</code> method',
-										url:		'http://www.w3.org/TR/html5/common-input-element-attributes.html#dom-input-stepdown'
+										url:		'http://www.w3.org/TR/html5/forms.html#dom-input-stepdown'
 									}, {
 										id:			'stepUp',
 										name: 		'<code>stepUp()</code> method',
-										url:		'http://www.w3.org/TR/html5/common-input-element-attributes.html#dom-input-stepup'
+										url:		'http://www.w3.org/TR/html5/forms.html#dom-input-stepup'
 									}, {
 										id:			'valueAsNumber',
 										name: 		'<code>valueAsNumber()</code> method',
-										url:		'http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-valueasnumber'
+										url:		'http://www.w3.org/TR/html5/forms.html#dom-input-valueasnumber'
 									}
 								]
 					}, {
@@ -639,42 +639,42 @@ var tests = [
 									{
 										id:			'element',
 										name: 		'Minimal element support',
-										url:		'http://www.w3.org/TR/html5/number-state.html#number-state'
+										url:		'http://www.w3.org/TR/html5/forms.html#number-state-(type=number)'
 									}, {
 										id:			'ui',
 										name: 		'Custom user-interface'
 									}, {
 										id:			'sanitization',
 										name: 		'Value sanitization', 
-										url:		'http://www.w3.org/TR/html5/the-input-element.html#value-sanitization-algorithm'
+										url:		'http://www.w3.org/TR/html5/forms.html#value-sanitization-algorithm'
 									}, {
 										id:			'validation',
 										name: 		'Field validation', 
-										url:		'http://www.w3.org/TR/html5/association-of-controls-and-forms.html#dom-cva-validity'
+										url:		'http://www.w3.org/TR/html5/forms.html#the-constraint-validation-api'
 									}, {
 										id:			'min',
 										name: 		'<code>min</code> attribute', 
-										url:		'http://www.w3.org/TR/html5/the-input-element.html#dom-input-min'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-input-min'
 									}, {
 										id:			'max',
 										name: 		'<code>max</code> attribute', 
-										url:		'http://www.w3.org/TR/html5/the-input-element.html#dom-input-max'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-input-max'
 									}, {
 										id:			'step',
 										name: 		'<code>step</code> attribute', 
-										url:		'http://www.w3.org/TR/html5/the-input-element.html#dom-input-step'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-input-step'
 									}, {
 										id:			'stepDown',
 										name: 		'<code>stepDown()</code> method',
-										url:		'http://www.w3.org/TR/html5/common-input-element-attributes.html#dom-input-stepdown'
+										url:		'http://www.w3.org/TR/html5/forms.html#dom-input-stepdown'
 									}, {
 										id:			'stepUp',
 										name: 		'<code>stepUp()</code> method',
-										url:		'http://www.w3.org/TR/html5/common-input-element-attributes.html#dom-input-stepup'
+										url:		'http://www.w3.org/TR/html5/forms.html#dom-input-stepup'
 									}, {
 										id:			'valueAsNumber',
 										name: 		'<code>valueAsNumber()</code> method',
-										url:		'http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-valueasnumber'
+										url:		'http://www.w3.org/TR/html5/forms.html#dom-input-valueasnumber'
 									}
 								]
 					}, {
@@ -684,38 +684,38 @@ var tests = [
 									{
 										id:			'element',
 										name: 		'Minimal element support',
-										url:		'http://www.w3.org/TR/html5/number-state.html#range-state'
+										url:		'http://www.w3.org/TR/html5/forms.html#range-state-(type=range)'
 									}, {
 										id:			'ui',
 										name: 		'Custom user-interface'
 									}, {
 										id:			'sanitization',
 										name: 		'Value sanitization', 
-										url:		'http://www.w3.org/TR/html5/the-input-element.html#value-sanitization-algorithm'
+										url:		'http://www.w3.org/TR/html5/forms.html#value-sanitization-algorithm'
 									}, {
 										id:			'min',
 										name: 		'<code>min</code> attribute', 
-										url:		'http://www.w3.org/TR/html5/the-input-element.html#dom-input-min'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-input-min'
 									}, {
 										id:			'max',
 										name: 		'<code>max</code> attribute', 
-										url:		'http://www.w3.org/TR/html5/the-input-element.html#dom-input-max'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-input-max'
 									}, {
 										id:			'step',
 										name: 		'<code>step</code> attribute', 
-										url:		'http://www.w3.org/TR/html5/the-input-element.html#dom-input-step'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-input-step'
 									}, {
 										id:			'stepDown',
 										name: 		'<code>stepDown()</code> method',
-										url:		'http://www.w3.org/TR/html5/common-input-element-attributes.html#dom-input-stepdown'
+										url:		'http://www.w3.org/TR/html5/forms.html#dom-input-stepdown'
 									}, {
 										id:			'stepUp',
 										name: 		'<code>stepUp()</code> method',
-										url:		'http://www.w3.org/TR/html5/common-input-element-attributes.html#dom-input-stepup'
+										url:		'http://www.w3.org/TR/html5/forms.html#dom-input-stepup'
 									}, {
 										id:			'valueAsNumber',
 										name: 		'<code>valueAsNumber()</code> method',
-										url:		'http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-valueasnumber'
+										url:		'http://www.w3.org/TR/html5/forms.html#dom-input-valueasnumber'
 									}
 								]
 					}, {
@@ -725,14 +725,14 @@ var tests = [
 									{
 										id:			'element',
 										name: 		'Minimal element support',
-										url:		'http://www.w3.org/TR/html5/number-state.html#color-state'
+										url:		'http://www.w3.org/TR/html5/forms.html#color-state-(type=color)'
 									}, {
 										id:			'ui',
 										name: 		'Custom user-interface'
 									}, {
 										id:			'sanitization',
 										name: 		'Value sanitization', 
-										url:		'http://www.w3.org/TR/html5/the-input-element.html#value-sanitization-algorithm'
+										url:		'http://www.w3.org/TR/html5/forms.html#value-sanitization-algorithm'
 									}
 								]
 					}, {
@@ -742,11 +742,11 @@ var tests = [
 									{
 										id:			'element',
 										name: 		'Minimal element support',
-										url:		'http://www.w3.org/TR/html5/number-state.html#checkbox-state'
+										url:		'http://www.w3.org/TR/html5/forms.html#checkbox-state-(type=checkbox)'
 									}, {
 										id:			'indeterminate',
 										name: 		'<code>indeterminate</code> property', 
-										url:		'http://www.w3.org/TR/html5/the-input-element.html#dom-input-indeterminate'
+										url:		'http://www.w3.org/TR/html5/forms.html#dom-input-indeterminate'
 									}
 								]
 					}, {
@@ -756,15 +756,15 @@ var tests = [
 									{
 										id:			'element',
 										name: 		'Minimal element support', 
-										url:		'http://www.w3.org/TR/html5/number-state.html#image-button-state'
+										url:		'http://www.w3.org/TR/html5/forms.html#image-button-state-(type=image)'
 									}, {
 										id:			'width',
 										name: 		'<code>width</code> property', 
-										url:		'http://www.w3.org/TR/html5/the-map-element.html#attr-dim-width'
+										url:		'http://www.w3.org/TR/html5/embedded-content-0.html#attr-dim-width'
 									}, {
 										id:			'height',
 										name: 		'<code>height</code> property', 
-										url:		'http://www.w3.org/TR/html5/the-map-element.html#attr-dim-height'
+										url:		'http://www.w3.org/TR/html5/embedded-content-0.html#attr-dim-height'
 									}
 								]
 					}, {
@@ -774,11 +774,11 @@ var tests = [
 									{
 										id:			'element',
 										name: 		'Minimal element support', 
-										url:		'http://www.w3.org/TR/html5/number-state.html#file-upload-state'
+										url:		'http://www.w3.org/TR/html5/forms.html#file-upload-state-(type=file)'
 									}, {
 										id:			'files',
 										name: 		'<code>files</code> property', 
-										url:		'http://www.w3.org/TR/html5/common-input-element-attributes.html#dom-input-files'
+										url:		'http://www.w3.org/TR/html5/forms.html#dom-input-files'
 									}
 								]
 					}, {
@@ -788,15 +788,15 @@ var tests = [
 									{
 										id:			'element',
 										name: 		'Minimal element support', 
-										url:		'http://www.w3.org/TR/html5/the-button-element.html#the-textarea-element'
+										url:		'http://www.w3.org/TR/html5/forms.html#the-textarea-element'
 									}, {
 										id:			'maxlength',
 										name:		'<code>maxlength</code> attribute',
-										url:		'http://www.w3.org/TR/html5/the-button-element.html#attr-textarea-maxlength'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-textarea-maxlength'
 									}, {
 										id:			'wrap',
 										name:		'<code>wrap</code> attribute',
-										url:		'http://www.w3.org/TR/html5/the-button-element.html#attr-textarea-wrap'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-textarea-wrap'
 									}
 								]
 					}, {
@@ -806,11 +806,11 @@ var tests = [
 									{
 										id:			'element',
 										name: 		'Minimal element support', 
-										url:		'http://www.w3.org/TR/html5/the-button-element.html#the-select-element'
+										url:		'http://www.w3.org/TR/html5/forms.html#the-select-element'
 									}, {
 										id:			'required',
 										name:		'<code>required</code> attribute',
-										url:		'http://www.w3.org/TR/html5/the-button-element.html#dom-select-required'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-select-required'
 									}
 								]
 					}, {
@@ -838,11 +838,11 @@ var tests = [
 									{
 										id:			'element',
 										name: 		'Minimal element support', 
-										url:		'http://www.w3.org/TR/html5/the-button-element.html#the-datalist-element'
+										url:		'http://www.w3.org/TR/html5/forms.html#the-datalist-element'
 									}, {
 										id:			'list',
 										name:		'<code>list</code> attribute for fields',
-										url:		'http://www.w3.org/TR/html5/common-input-element-attributes.html#attr-input-list'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-input-list'
 									}
 								]
 					}, {
@@ -852,15 +852,15 @@ var tests = [
 									{
 										id:			'element',
 										name: 		'Minimal element support', 
-										url:		'http://www.w3.org/TR/html5/the-button-element.html#the-keygen-element'
+										url:		'http://www.w3.org/TR/html5/forms.html#the-keygen-element'
 									}, {
 										id:			'challenge',
 										name: 		'<code>challenge</code> attribute', 
-										url:		'http://www.w3.org/TR/html5/the-button-element.html#attr-keygen-challenge'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-keygen-challenge'
 									}, {
 										id:			'keytype',
 										name: 		'<code>keytype</code> attribute', 
-										url:		'http://www.w3.org/TR/html5/the-button-element.html#dom-keygen-keytype'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-keygen-keytype'
 									}
 								]
 					}, {
@@ -870,7 +870,7 @@ var tests = [
 									{
 										id:			'element',
 										name: 		'Minimal element support', 
-										url:		'http://www.w3.org/TR/html5/the-button-element.html#the-output-element'
+										url:		'http://www.w3.org/TR/html5/forms.html#the-output-element'
 									}
 								]
 					}, {
@@ -880,7 +880,7 @@ var tests = [
 									{
 										id:			'element',
 										name: 		'Minimal element support', 
-										url:		'http://www.w3.org/TR/html5/the-button-element.html#the-progress-element'
+										url:		'http://www.w3.org/TR/html5/forms.html#the-progress-element'
 									}
 								]
 					}, {
@@ -890,7 +890,7 @@ var tests = [
 									{
 										id:			'element',
 										name: 		'Minimal element support', 
-										url:		'http://www.w3.org/TR/html5/the-button-element.html#the-meter-element'
+										url:		'http://www.w3.org/TR/html5/forms.html#the-meter-element'
 									}
 								]
 					},
@@ -904,11 +904,11 @@ var tests = [
 									{
 										id:			'pattern',
 										name: 		'<code>pattern</code> attribute', 
-										url:		'http://www.w3.org/TR/html5/common-input-element-attributes.html#attr-input-pattern'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-input-pattern'
 									}, {
 										id:			'required',
 										name: 		'<code>required</code> attribute', 
-										url:		'http://www.w3.org/TR/html5/common-input-element-attributes.html#attr-input-required'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-input-required'
 									}
 								]
 					}, {
@@ -922,27 +922,27 @@ var tests = [
 									}, {
 										id:			'form',
 										name: 		'<code>form</code> property on fields', 
-										url:		'http://www.w3.org/TR/html5/association-of-controls-and-forms.html#attr-fae-form'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-fae-form'
 									}, {
 										id:			'formAction',
 										name: 		'<code>formAction</code> property on fields', 
-										url:		'http://www.w3.org/TR/html5/association-of-controls-and-forms.html#attr-fs-formaction'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-fs-formaction'
 									}, {
 										id:			'formEnctype',
 										name: 		'<code>formEnctype</code> property on fields', 
-										url:		'http://www.w3.org/TR/html5/association-of-controls-and-forms.html#attr-fs-formenctype'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-fs-formenctype'
 									}, {
 										id:			'formMethod',
 										name: 		'<code>formMethod</code> property on fields', 
-										url:		'http://www.w3.org/TR/html5/association-of-controls-and-forms.html#attr-fs-formmethod'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-fs-formmethod'
 									}, {
 										id:			'formNoValidate',
 										name: 		'<code>formNoValidate</code> property on fields', 
-										url:		'http://www.w3.org/TR/html5/association-of-controls-and-forms.html#attr-fs-formnovalidate'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-fs-formnovalidate'
 									}, {
 										id:			'formTarget',
 										name: 		'<code>formTarget</code> property on fields', 
-										url:		'http://www.w3.org/TR/html5/association-of-controls-and-forms.html#attr-fs-formtarget'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-fs-formtarget'
 									}, {
 										id:			'labels',
 										name: 		'<code>labels</code> property on fields', 
@@ -956,23 +956,23 @@ var tests = [
 									{
 										id:			'autofocus',
 										name: 		'<code>autofocus</code> attribute', 
-										url:		'http://www.w3.org/TR/html5/association-of-controls-and-forms.html#autofocusing-a-form-control'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-fe-autofocus'
 									}, {
 										id:			'autocomplete',
 										name: 		'<code>autocomplete</code> attribute',
-										url:		'http://www.w3.org/TR/html5/common-input-element-attributes.html#attr-input-autocomplete'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-input-autocomplete'
 									}, {
 										id:			'placeholder',
 										name: 		'<code>placeholder</code> attribute',
-										url:		'http://www.w3.org/TR/html5/common-input-element-attributes.html#attr-input-placeholder'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-input-placeholder'
 									}, {
 										id:			'multiple',
 										name: 		'<code>multiple</code> attribute',
-										url:		'http://www.w3.org/TR/html5/common-input-element-attributes.html#attr-input-multiple'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-input-multiple'
 									}, {
 										id:			'dirname',
 										name: 		'<code>dirName</code> attribute',
-										url:		'http://www.w3.org/TR/html5/common-input-element-attributes.html#attr-input-dirname'
+										url:		'http://www.w3.org/TR/html5/forms.html#attr-input-dirname'
 									}
 								]
 					}, {
@@ -1020,11 +1020,11 @@ var tests = [
 									{
 										id:			'oninput',
 										name: 		'<code>oninput</code> event', 
-										url:		'http://www.w3.org/TR/html5/common-input-element-attributes.html#event-input-input'
+										url:		'http://www.w3.org/TR/html5/forms.html#event-input-input'
 									}, {
 										id:			'onchange',
 										name: 		'<code>onchange</code> event', 
-										url:		'http://www.w3.org/TR/html5/common-input-element-attributes.html#event-input-change'
+										url:		'http://www.w3.org/TR/html5/forms.html#event-input-change'
 									}, {
 										id:			'oninvalid',
 										name: 		'<code>oninvalid</code> event', 
@@ -1046,7 +1046,7 @@ var tests = [
 									}, {
 										id:			'noValidate',
 										name: 		'<code>noValidate</code> attribute', 
-										url:		'http://www.w3.org/TR/html5/association-of-controls-and-forms.html#attr-fs-novalidate'
+										url:		'http://www.w3.org/TR/html5/forms.html#dom-fs-novalidate'
 									}
 								]
 					}
@@ -1067,11 +1067,11 @@ var tests = [
 									{
 										id:			'draggable',
 										name: 		'<code>draggable</code> attribute', 
-										url:		'http://www.w3.org/TR/html5/dnd.html#the-draggable-attribute'
+										url:		'http://www.w3.org/TR/html5/editing.html#the-draggable-attribute'
 									}, {
 										id:			'dropzone',
 										name: 		'<code>dropzone</code> attribute', 
-										url:		'http://www.w3.org/TR/html5/dnd.html#the-dropzone-attribute'
+										url:		'http://www.w3.org/TR/html5/editing.html#the-dropzone-attribute	'
 									}
 								]
 					}, {
@@ -1084,31 +1084,31 @@ var tests = [
 									{
 										id:			'ondrag',
 										name: 		'<code>ondrag</code> event', 
-										url:		'http://www.w3.org/TR/html5/dnd.html#dndevents'
+										url:		'http://www.w3.org/TR/html5/editing.html#dndevents'
 									}, {
 										id:			'ondragstart',
 										name: 		'<code>ondragstart</code> event', 
-										url:		'http://www.w3.org/TR/html5/dnd.html#dndevents'
+										url:		'http://www.w3.org/TR/html5/editing.html#dndevents'
 									}, {
 										id:			'ondragenter',
 										name: 		'<code>ondragenter</code> event', 
-										url:		'http://www.w3.org/TR/html5/dnd.html#dndevents'
+										url:		'http://www.w3.org/TR/html5/editing.html#dndevents'
 									}, {
 										id:			'ondragover',
 										name: 		'<code>ondragover</code> event', 
-										url:		'http://www.w3.org/TR/html5/dnd.html#dndevents'
+										url:		'http://www.w3.org/TR/html5/editing.html#dndevents'
 									}, {
 										id:			'ondragleave',
 										name: 		'<code>ondragleave</code> event', 
-										url:		'http://www.w3.org/TR/html5/dnd.html#dndevents'
+										url:		'http://www.w3.org/TR/html5/editing.html#dndevents'
 									}, {
 										id:			'ondragend',
 										name: 		'<code>ondragend</code> event', 
-										url:		'http://www.w3.org/TR/html5/dnd.html#dndevents'
+										url:		'http://www.w3.org/TR/html5/editing.html#dndevents'
 									}, {
 										id:			'ondrop',
 										name: 		'<code>ondrop</code> event', 
-										url:		'http://www.w3.org/TR/html5/dnd.html#dndevents'
+										url:		'http://www.w3.org/TR/html5/editing.html#dndevents'
 									}
 								]
 					},
@@ -1155,27 +1155,27 @@ var tests = [
 									{
 										id:			'execCommand',
 										name: 		'<code>execCommand</code> method', 
-										url:		'http://www.w3.org/TR/html5/dnd.html#execCommand'
+										url:		'https://dvcs.w3.org/hg/editing/raw-file/tip/editing.html'
 									}, {
 										id:			'queryCommandEnabled',
 										name: 		'<code>queryCommandEnabled</code> method', 
-										url:		'http://www.w3.org/TR/html5/dnd.html#dom-document-querycommandenabled'
+										url:		'https://dvcs.w3.org/hg/editing/raw-file/tip/editing.html'
 									}, {
 										id:			'queryCommandIndeterm',
 										name: 		'<code>queryCommandIndeterm</code> method', 
-										url:		'http://www.w3.org/TR/html5/dnd.html#dom-document-querycommandindeterm'
+										url:		'https://dvcs.w3.org/hg/editing/raw-file/tip/editing.html'
 									}, {
 										id:			'queryCommandState',
 										name: 		'<code>queryCommandState</code> method', 
-										url:		'http://www.w3.org/TR/html5/dnd.html#dom-document-querycommandstate'
+										url:		'https://dvcs.w3.org/hg/editing/raw-file/tip/editing.html'
 									}, {
 										id:			'queryCommandSupported',
 										name: 		'<code>queryCommandSupported</code> method', 
-										url:		'http://www.w3.org/TR/html5/dnd.html#dom-document-querycommandsupported'
+										url:		'https://dvcs.w3.org/hg/editing/raw-file/tip/editing.html'
 									}, {
 										id:			'queryCommandValue',
 										name: 		'<code>queryCommandValue</code> method', 
-										url:		'http://www.w3.org/TR/html5/dnd.html#dom-document-querycommandvalue'
+										url:		'https://dvcs.w3.org/hg/editing/raw-file/tip/editing.html'
 									}
 								]
 					}, 
@@ -1196,7 +1196,7 @@ var tests = [
 						id:			'history',
 						name: 		'Session history', 
 						urls:		{
-										'w3c':	'http://www.w3.org/TR/html5/history.html#history',
+										'w3c':	'http://www.w3.org/TR/html5/browsers.html#the-history-interface',
 										'wp': 	'/dom/history',
 										'mdn':	'/DOM/Manipulating_the_browser_history'
 									}
@@ -1220,7 +1220,7 @@ var tests = [
 						id:			'applicationCache',
 						name: 		'Application Cache', 
 						urls:		{
-										'w3c':	'http://www.w3.org/TR/html5/offline.html#offline',
+										'w3c':	'http://www.w3.org/TR/html5/browsers.html#offline',
 										'wp': 	'/apis/appcache/ApplicationCache',
 										'mdn':	'/HTML/Using_the_application_cache'
 									}
@@ -1228,14 +1228,14 @@ var tests = [
 						id:			'registerProtocolHandler',
 						name: 		'Custom scheme handlers', 
 						urls:		{
-										'w3c':	'http://www.w3.org/TR/html5/timers.html#custom-handlers',
+										'w3c':	'http://www.w3.org/TR/html5/webappapis.html#custom-handlers',
 										'mdn':	'/docs/Web-based_protocol_handlers'
 									}
 					}, {
 						id:			'registerContentHandler',
 						name: 		'Custom content handlers', 
 						urls:		{
-										'w3c':	'http://www.w3.org/TR/html5/timers.html#custom-handlers',
+										'w3c':	'http://www.w3.org/TR/html5/webappapis.html#custom-handlers',
 										'mdn':	'/DOM/window.navigator.registerContentHandler'
 									}
 					}, {
@@ -1252,21 +1252,21 @@ var tests = [
 						id:			'sandbox',
 						name: 		'Sandboxed <code>iframe</code>', 
 						urls:		{
-										'w3c':	'http://www.w3.org/TR/html5/the-iframe-element.html#attr-iframe-sandbox',
+										'w3c':	'http://www.w3.org/TR/html5/embedded-content-0.html#attr-iframe-sandbox',
 										'mdn':	'/HTML/Element/iframe'
 									}
 					}, {
 						id:			'seamless',
 						name: 		'Seamless <code>iframe</code>', 
 						urls:		{
-										'w3c':	'http://www.w3.org/TR/html5/the-iframe-element.html#attr-iframe-seamless',
+										'w3c':	'http://www.w3.org/TR/html5/embedded-content-0.html#attr-iframe-seamless',
 										'mdn':	'/HTML/Element/iframe'
 									}
 					}, {
 						id:			'srcdoc',
 						name: 		'<code>iframe</code> with inline contents', 
 						urls:		{
-										'w3c':	'http://www.w3.org/TR/html5/the-iframe-element.html#attr-iframe-srcdoc',
+										'w3c':	'http://www.w3.org/TR/html5/embedded-content-0.html#attr-iframe-srcdoc',
 										'mdn':	'/HTML/Element/iframe'
 									}
 					}
@@ -1278,7 +1278,7 @@ var tests = [
 					{
 						id:			'scoped',
 						name: 		'Scoped <code>style</code> element', 
-						url:		'http://www.w3.org/TR/html5/semantics.html#attr-style-scoped'
+						url:		'http://www.w3.org/TR/html5/document-metadata.html#attr-style-scoped'
 					}, {
 						id:			'async',
 						name: 		'Asyncronous script execution', 

From b48225307deee42db0d85bd49d785b200b1caee5 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:01:09 +0200
Subject: [PATCH 115/174] Fix a bug in the way background tasks are tracked

---
 scripts/engine.js | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/scripts/engine.js b/scripts/engine.js
index b2b8fadd..c62ee148 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -56,17 +56,20 @@ Test = (function() {
 									)	
 			};
 	
-			this.backgroundTasks = {};
+			this.backgroundTasks = [];
+			this.backgroundIds = {};
+			this.backgroundId = 0;
+			
 			this.callback = c;
 			
 			this.results = new results(this);
 			
-			for (g in this.suites) {
-				for (s in this.suites[g]) {
+			for (var g = 0; g < this.suites.length; g++) {
+				for (var s = 0; s < this.suites[g].length; s++) {
 					new (this.suites[g][s])(this.results);
 				}
 			}
-			
+
 			this.waitForBackground();
 		},
 		
@@ -80,7 +83,7 @@ Test = (function() {
 		
 		checkForBackground: function() {
 			var running = 0;
-			for (var task in this.backgroundTasks) { running += this.backgroundTasks[task] }
+			for (var task = 0; task < this.backgroundTasks.length; task++) { running += this.backgroundTasks[task] }
 
 			if (running) {
 				this.waitForBackground();
@@ -90,11 +93,13 @@ Test = (function() {
 		},
 		
 		startBackground: function(id) {
-			this.backgroundTasks[id] = 1;
+			var i = this.backgroundId++;
+			this.backgroundIds[id] = i;
+			this.backgroundTasks[i] = 1;
 		},
 		
 		stopBackground: function(id) {
-			this.backgroundTasks[id] = 0;
+			this.backgroundTasks[this.backgroundIds[id]] = 0;
 		},
 		
 		finished: function() {
@@ -103,7 +108,7 @@ Test = (function() {
 			collectResults(0, '', this.results);
 			function collectResults(level, prefix, data) {
 				if (data.items) {
-					for (i in data.items) {
+					for (var i = 0; i < data.items.length; i++) {
 						if (level == 0) points.push(data.items[i].data.id + '=' + data.items[i].points + '/' + data.items[i].max + '+' + data.items[i].bonus);
 						if (typeof data.items[i].data.passed != 'undefined') results.push(prefix + data.items[i].data.id + '=' + (!! data.items[i].data.passed ? 1 : 0));
 						if (data.items[i].items) {

From 858113d1e9a0007d7ac1e5a19080b2a76500ec13 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:02:26 +0200
Subject: [PATCH 116/174] Place the entire tokenizer test in a try {} catch {}
 block

---
 scripts/engine.js | 116 ++++++++++++++++++++++++----------------------
 1 file changed, 60 insertions(+), 56 deletions(-)

diff --git a/scripts/engine.js b/scripts/engine.js
index c62ee148..d9df3d4e 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -520,63 +520,67 @@ Test = (function() {
 			var result = true;
 			var e = document.createElement('div');	
 			
-			e.innerHTML = "<div<div>";
-			result &= e.firstChild && e.firstChild.nodeName == "DIV<DIV";
-			
-			e.innerHTML = "<div foo<bar=''>";
-			result &= e.firstChild.attributes[0].nodeName == "foo<bar";
-			
-			e.innerHTML = "<div foo=`bar`>";
-			result &= e.firstChild.getAttribute("foo") == "`bar`";
-			
-			e.innerHTML = "<div \"foo=''>";
-			result &= e.firstChild && e.firstChild.attributes[0].nodeName == "\"foo";
-			
-			e.innerHTML = "<a href='\nbar'></a>";
-			result &= e.firstChild && e.firstChild.getAttribute("href") == "\nbar";
-			
-			e.innerHTML = "<!DOCTYPE html>";
-			result &= e.firstChild == null;
-			
-			e.innerHTML = "\u000D";
-			result &= e.firstChild && e.firstChild.nodeValue == "\u000A";
-			
-			e.innerHTML = "&lang;&rang;";
-			result &= e.firstChild.nodeValue == "\u27E8\u27E9";
-			
-			e.innerHTML = "&apos;";
-			result &= e.firstChild.nodeValue == "'";
-			
-			e.innerHTML = "&ImaginaryI;";
-			result &= e.firstChild.nodeValue == "\u2148";
-			
-			e.innerHTML = "&Kopf;";
-			result &= e.firstChild.nodeValue == "\uD835\uDD42";
-			
-			e.innerHTML = "&notinva;";
-			result &= e.firstChild.nodeValue == "\u2209";
-			
-			e.innerHTML = '<?import namespace="foo" implementation="#bar">';
-			result &= e.firstChild && e.firstChild.nodeType == 8 && e.firstChild.nodeValue == '?import namespace="foo" implementation="#bar"';
-			
-			e.innerHTML = '<!--foo--bar-->';
-			result &= e.firstChild && e.firstChild.nodeType == 8 && e.firstChild.nodeValue == 'foo--bar';
-			
-			e.innerHTML = '<![CDATA[x]]>';
-			result &= e.firstChild && e.firstChild.nodeType == 8 && e.firstChild.nodeValue == '[CDATA[x]]';
-			
-			e.innerHTML = "<textarea><!--</textarea>--></textarea>";
-			result &= e.firstChild && e.firstChild.firstChild && e.firstChild.firstChild.nodeValue == "<!--";
+			try {
+				e.innerHTML = "<div<div>";
+				result &= e.firstChild && e.firstChild.nodeName == "DIV<DIV";
+	
+				e.innerHTML = "<div foo<bar=''>";
+				result &= e.firstChild.attributes[0].nodeName == "foo<bar";
 				
-			e.innerHTML = "<textarea><!--</textarea>-->";
-			result &= e.firstChild && e.firstChild.firstChild && e.firstChild.firstChild.nodeValue == "<!--";
-			
-			e.innerHTML = "<style><!--</style>--></style>";
-			result &= e.firstChild && e.firstChild.firstChild && e.firstChild.firstChild.nodeValue == "<!--";
-			
-			e.innerHTML = "<style><!--</style>-->";
-			result &= e.firstChild && e.firstChild.firstChild && e.firstChild.firstChild.nodeValue == "<!--";
-			
+				e.innerHTML = "<div foo=`bar`>";
+				result &= e.firstChild.getAttribute("foo") == "`bar`";
+				
+				e.innerHTML = "<div \"foo=''>";
+				result &= e.firstChild && e.firstChild.attributes[0].nodeName == "\"foo";
+				
+				e.innerHTML = "<a href='\nbar'></a>";
+				result &= e.firstChild && e.firstChild.getAttribute("href") == "\nbar";
+				
+				e.innerHTML = "<!DOCTYPE html>";
+				result &= e.firstChild == null;
+				
+				e.innerHTML = "\u000D";
+				result &= e.firstChild && e.firstChild.nodeValue == "\u000A";
+				
+				e.innerHTML = "&lang;&rang;";
+				result &= e.firstChild.nodeValue == "\u27E8\u27E9";
+				
+				e.innerHTML = "&apos;";
+				result &= e.firstChild.nodeValue == "'";
+				
+				e.innerHTML = "&ImaginaryI;";
+				result &= e.firstChild.nodeValue == "\u2148";
+				
+				e.innerHTML = "&Kopf;";
+				result &= e.firstChild.nodeValue == "\uD835\uDD42";
+				
+				e.innerHTML = "&notinva;";
+				result &= e.firstChild.nodeValue == "\u2209";
+				
+				e.innerHTML = '<?import namespace="foo" implementation="#bar">';
+				result &= e.firstChild && e.firstChild.nodeType == 8 && e.firstChild.nodeValue == '?import namespace="foo" implementation="#bar"';
+				
+				e.innerHTML = '<!--foo--bar-->';
+				result &= e.firstChild && e.firstChild.nodeType == 8 && e.firstChild.nodeValue == 'foo--bar';
+				
+				e.innerHTML = '<![CDATA[x]]>';
+				result &= e.firstChild && e.firstChild.nodeType == 8 && e.firstChild.nodeValue == '[CDATA[x]]';
+				
+				e.innerHTML = "<textarea><!--</textarea>--></textarea>";
+				result &= e.firstChild && e.firstChild.firstChild && e.firstChild.firstChild.nodeValue == "<!--";
+					
+				e.innerHTML = "<textarea><!--</textarea>-->";
+				result &= e.firstChild && e.firstChild.firstChild && e.firstChild.firstChild.nodeValue == "<!--";
+				
+				e.innerHTML = "<style><!--</style>--></style>";
+				result &= e.firstChild && e.firstChild.firstChild && e.firstChild.firstChild.nodeValue == "<!--";
+				
+				e.innerHTML = "<style><!--</style>-->";
+				result &= e.firstChild && e.firstChild.firstChild && e.firstChild.firstChild.nodeValue == "<!--";
+			} catch(e) {
+				result = false;
+			}
+
 			this.section.setItem({
 				id:		'tokenizer',
 				passed:	result, 

From a04d05da7d862507f3ab9545474bf7bc83f1a5ed Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:03:15 +0200
Subject: [PATCH 117/174] Catch exceptions from the fillText test

---
 scripts/engine.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/scripts/engine.js b/scripts/engine.js
index d9df3d4e..5d31a39c 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -695,9 +695,18 @@ Test = (function() {
 				value: 	10
 			});
 
+			var passed = false;
+			if (this.canvas.getContext) {
+				try {
+					passed = typeof this.canvas.getContext('2d').fillText == 'function';
+				}
+				catch(e) {
+				}
+			}
+			
 			this.section.setItem({
 				id:		'text',
-				passed:	!! (this.canvas.getContext && typeof this.canvas.getContext('2d').fillText == 'function'), 
+				passed:	passed, 
 				value: 	5
 			});
 		}

From 018088ba53fc0ca47fb614e3e2be97df2a1e2a99 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:05:49 +0200
Subject: [PATCH 118/174] Catch exceptions from the elements tests

---
 scripts/engine.js | 168 +++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 144 insertions(+), 24 deletions(-)

diff --git a/scripts/engine.js b/scripts/engine.js
index 5d31a39c..ed235191 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -921,9 +921,15 @@ Test = (function() {
 				var element = document.createElement(elements[e]);
 				document.body.appendChild(element);
 
-					group.setItem({
+				var passed = false;
+				try { 
+					passed = typeof HTMLElement != 'undefined' && element instanceof HTMLElement && this.isBlock(element) && this.closesImplicitly(elements[e]);
+				} catch(error) {
+				}
+				
+				group.setItem({
 					id:		elements[e],
-					passed:	typeof HTMLElement != 'undefined' && element instanceof HTMLElement && this.isBlock(element) && this.closesImplicitly(elements[e]), 
+					passed:	passed, 
 					value: 	1
 				});
 
@@ -940,9 +946,15 @@ Test = (function() {
 				var element = document.createElement(elements[e]);
 				document.body.appendChild(element);
 
-					group.setItem({
+				var passed = false;
+				try { 
+					passed = typeof HTMLElement != 'undefined' && element instanceof HTMLElement && this.isBlock(element) && (elements[e] != 'figure' || this.closesImplicitly(elements[e]));
+				} catch(error) {
+				}
+
+				group.setItem({
 					id:		elements[e],
-					passed:	typeof HTMLElement != 'undefined' && element instanceof HTMLElement && this.isBlock(element) && (elements[e] != 'figure' || this.closesImplicitly(elements[e])), 
+					passed:	passed, 
 					value: 	1
 				});
 
@@ -978,9 +990,15 @@ Test = (function() {
 			var element = document.createElement('mark');
 			document.body.appendChild(element);
 
+			var passed = false;
+			try { 
+				passed = typeof HTMLElement != 'undefined' && element instanceof HTMLElement && (color = this.getStyle(element, 'background-color')) && (color != 'transparent');
+			} catch(error) {
+			}
+
 			group.setItem({
 				id:		'mark',
-				passed:	typeof HTMLElement != 'undefined' && element instanceof HTMLElement && (color = this.getStyle(element, 'background-color')) && (color != 'transparent'), 
+				passed:	passed, 
 				value: 	1
 			});
 
@@ -992,9 +1010,18 @@ Test = (function() {
 			var rubyElement = document.getElementById('ruby');
 			var rtElement = document.getElementById('rt');
 			var rpElement = document.getElementById('rp');
-			var rubySupport = rubyElement && typeof HTMLElement != 'undefined' && rubyElement instanceof HTMLElement;
-			var rtSupport = rtElement && typeof HTMLElement != 'undefined' && rtElement instanceof HTMLElement;
-			var rpSupport = rpElement && typeof HTMLElement != 'undefined' && rpElement instanceof HTMLElement && this.isHidden(rpElement);
+			
+			var rubySupport = false;
+			var rtSupport = false;
+			var rpSupport = false;
+
+			try {
+				rubySupport = rubyElement && typeof HTMLElement != 'undefined' && rubyElement instanceof HTMLElement;
+				rtSupport = rtElement && typeof HTMLElement != 'undefined' && rtElement instanceof HTMLElement;
+				rpSupport = rpElement && typeof HTMLElement != 'undefined' && rpElement instanceof HTMLElement && this.isHidden(rpElement);
+			} catch(error) {				
+			}
+			
 			document.body.removeChild(container);					
 			
 			group.setItem({
@@ -1005,17 +1032,29 @@ Test = (function() {
 
 			var element = document.createElement('time');
 
+			var passed = false;
+			try { 
+				passed = typeof HTMLTimeElement != 'undefined' && element instanceof HTMLTimeElement;
+			} catch(error) {
+			}
+
 			group.setItem({
 				id:		'time',
-				passed:	typeof HTMLTimeElement != 'undefined' && element instanceof HTMLTimeElement, 
+				passed:	passed, 
 				value: 	1
 			});
 			
 			var element = document.createElement('wbr');
 
+			var passed = false;
+			try { 
+				passed = typeof HTMLElement != 'undefined' && element instanceof HTMLElement;
+			} catch(error) {
+			}
+
 			group.setItem({
 				id:		'wbr',
-				passed:	typeof HTMLElement != 'undefined' && element instanceof HTMLElement, 
+				passed:	passed, 
 				value: 	1
 			});
 
@@ -1041,9 +1080,15 @@ Test = (function() {
 			var element = document.createElement('summary');
 			document.body.appendChild(element);
 
+			var passed = false;
+			try { 
+				passed = typeof HTMLElement != 'undefined' && element instanceof HTMLElement;
+			} catch(error) {
+			}
+
 			group.setItem({
 				id:		'summary',
-				passed:	typeof HTMLElement != 'undefined' && element instanceof HTMLElement, 
+				passed:	passed, 
 				value: 	1
 			});
 
@@ -1052,9 +1097,15 @@ Test = (function() {
 			var element = document.createElement('command');
 			document.body.appendChild(element);
 
+			var passed = false;
+			try { 
+				passed = typeof HTMLCommandElement != 'undefined' && element instanceof HTMLCommandElement;
+			} catch(error) {
+			}
+
 			group.setItem({
 				id:		'command',
-				passed:	typeof HTMLCommandElement != 'undefined' && element instanceof HTMLCommandElement, 
+				passed:	passed, 
 				value: 	2
 			});
 
@@ -1063,9 +1114,15 @@ Test = (function() {
 			var element = document.createElement('menu');
 			document.body.appendChild(element);
 
+			var passed = false;
+			try { 
+				passed = typeof HTMLMenuElement != 'undefined' && element instanceof HTMLMenuElement;
+			} catch(error) {
+			}
+
 			group.setItem({
 				id:		'menu',
-				passed:	typeof HTMLMenuElement != 'undefined' && element instanceof HTMLMenuElement, 
+				passed:	passed, 
 				value: 	1
 			});
 
@@ -1081,9 +1138,15 @@ Test = (function() {
 			
 			var comparison = getRenderedStyle(element);
 			
+			var passed = false;
+			try { 
+				passed = typeof HTMLMenuElement != 'undefined' && element instanceof HTMLMenuElement && supported && baseline != comparison;
+			} catch(error) {
+			}
+
 			group.setItem({
 				id:		'menutoolbar',
-				passed:	typeof HTMLMenuElement != 'undefined' && element instanceof HTMLMenuElement && supported && baseline != comparison, 
+				passed:	passed, 
 				value: 	1
 			});
 
@@ -1091,15 +1154,21 @@ Test = (function() {
 
 			try {
 				element.type = 'context';
-			} catch(e) {
+			} catch(error) {
 				supported = false;
 			}
 			
 			var comparison = getRenderedStyle(element);
 		
+			var passed = false;
+			try { 
+				passed = typeof HTMLMenuElement != 'undefined' && element instanceof HTMLMenuElement && supported && baseline != comparison;
+			} catch(error) {
+			}
+
 			group.setItem({
 				id:		'menucontext',
-				passed:	typeof HTMLMenuElement != 'undefined' && element instanceof HTMLMenuElement && supported && baseline != comparison, 
+				passed:	passed, 
 				value: 	1
 			});
 
@@ -1628,9 +1697,15 @@ Test = (function() {
 			
 			var element = document.createElement('textarea');
 
+			var passed = false;
+			try { 
+				passed = typeof HTMLTextAreaElement != 'undefined' && element instanceof HTMLTextAreaElement;
+			} catch(error) {
+			}
+
 			group.setItem({
 				id:			'element',
-				passed:		typeof HTMLTextAreaElement != 'undefined' && element instanceof HTMLTextAreaElement, 
+				passed:		passed, 
 				value: 		0
 			});
 
@@ -1655,9 +1730,15 @@ Test = (function() {
 			
 			var element = document.createElement('select');
 
+			var passed = false;
+			try { 
+				passed = typeof HTMLSelectElement != 'undefined' && element instanceof HTMLSelectElement;
+			} catch(error) {
+			}
+
 			group.setItem({
 				id:			'element',
-				passed:		typeof HTMLSelectElement != 'undefined' && element instanceof HTMLSelectElement, 
+				passed:		passed, 
 				value: 		0
 			});
 
@@ -1676,9 +1757,15 @@ Test = (function() {
 			
 			var element = document.createElement('fieldset');
 
+			var passed = false;
+			try { 
+				passed = typeof HTMLFieldSetElement != 'undefined' && element instanceof HTMLFieldSetElement;
+			} catch(error) {
+			}
+
 			group.setItem({
 				id:			'element',
-				passed:		typeof HTMLFieldSetElement != 'undefined' && element instanceof HTMLFieldSetElement, 
+				passed:		passed, 
 				value: 		0
 			});
 
@@ -1703,9 +1790,15 @@ Test = (function() {
 			
 			var element = document.createElement('datalist');
 			
+			var passed = false;
+			try { 
+				passed = (typeof HTMLDataListElement != 'undefined' && element instanceof HTMLDataListElement) || element.childNodes.length;
+			} catch(error) {
+			}
+
 			group.setItem({
 				id:			'element',
-				passed:		(typeof HTMLDataListElement != 'undefined' && element instanceof HTMLDataListElement) || element.childNodes.length, 
+				passed:		passed, 
 				value: 		2,
 				required:	true
 			});
@@ -1728,9 +1821,15 @@ Test = (function() {
 			var element = document.createElement('div');
 			element.innerHTML = '<keygen>';
 			
+			var passed = false;
+			try { 
+				passed = typeof HTMLKeygenElement != 'undefined' && element.firstChild instanceof HTMLKeygenElement && 'challenge' in element.firstChild && 'keytype' in element.firstChild;
+			} catch(error) {
+			}
+
 			group.setItem({
 				id:			'element',
-				passed:		typeof HTMLKeygenElement != 'undefined' && element.firstChild instanceof HTMLKeygenElement && 'challenge' in element.firstChild && 'keytype' in element.firstChild, 
+				passed:		passed, 
 				value: 		2,
 				required:	true
 			});
@@ -1756,9 +1855,16 @@ Test = (function() {
 			});
 			
 			var element = document.createElement('output');
+
+			var passed = false;
+			try { 
+				passed = typeof HTMLOutputElement != 'undefined' && element instanceof HTMLOutputElement;
+			} catch(error) {
+			}
+
 			group.setItem({
 				id:			'element',
-				passed:		typeof HTMLOutputElement != 'undefined' && element instanceof HTMLOutputElement, 
+				passed:		passed, 
 				value: 		2
 			});
 
@@ -1770,9 +1876,16 @@ Test = (function() {
 			});
 			
 			var element = document.createElement('progress');
+
+			var passed = false;
+			try { 
+				passed = typeof HTMLProgressElement != 'undefined' && element instanceof HTMLProgressElement;
+			} catch(error) {
+			}
+
 			group.setItem({
 				id:			'element',
-				passed:		!blacklists.progressField && typeof HTMLProgressElement != 'undefined' && element instanceof HTMLProgressElement, 
+				passed:		!blacklists.progressField && passed, 
 				value: 		2
 			});
 			
@@ -1784,9 +1897,16 @@ Test = (function() {
 			});
 			
 			var element = document.createElement('meter');
+
+			var passed = false;
+			try { 
+				passed = typeof HTMLMeterElement != 'undefined' && element instanceof HTMLMeterElement;
+			} catch(error) {
+			}
+
 			group.setItem({
 				id:			'element',
-				passed:		!blacklists.meterField && typeof HTMLMeterElement != 'undefined' && element instanceof HTMLMeterElement, 
+				passed:		!blacklists.meterField && passed, 
 				value: 		2
 			});
 

From d2dd272c4341eba21d5b62b32b5319fd4eb50bee Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:06:37 +0200
Subject: [PATCH 119/174] Use a different method of inerating over arrays

---
 scripts/engine.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/engine.js b/scripts/engine.js
index ed235191..0c9abc46 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -917,7 +917,7 @@ Test = (function() {
 			
 			var elements = 'section nav article aside hgroup header footer'.split(' ');
 			
-			for (var e in elements) {
+			for (var e = 0; e < elements.length; e++) {
 				var element = document.createElement(elements[e]);
 				document.body.appendChild(element);
 
@@ -942,7 +942,7 @@ Test = (function() {
 			
 			var elements = 'figure figcaption'.split(' ');
 			
-			for (var e in elements) {
+			for (var e = 0; e < elements.length; e++) {
 				var element = document.createElement(elements[e]);
 				document.body.appendChild(element);
 
@@ -1384,7 +1384,7 @@ Test = (function() {
 			}
 			
 			var types = ['datetime', 'date', 'month', 'week', 'time', 'datetime-local'];
-			for (var t in types) {
+			for (var t = 0; t < types.length; t++) {
 				var group = this.section.getGroup({
 					id:		types[t]
 				});
@@ -1473,7 +1473,7 @@ Test = (function() {
 			}
 			
 			var types = ['number', 'range'];
-			for (var t in types) {
+			for (var t = 0; t < types.length; t++) {
 				var group = this.section.getGroup({
 					id:		types[t],
 					name:	'<code>input type=' + types[t] + '</code>'
@@ -1917,8 +1917,8 @@ Test = (function() {
 			var element = document.createElement('input');
 
 			var props = 'pattern required'.split(' ');
-				
-			for (var p in props) {
+			
+			for (var p = 0; p < props.length; p++) {
 					group.setItem({
 					id:			props[p],
 					passed:		!!(props[p] in element), 
@@ -1961,7 +1961,7 @@ Test = (function() {
 			
 			var element = document.createElement('input');
 
-			for (var p in props) {
+			for (var p = 0; p < props.length; p++) {
 					group.setItem({
 					id:			props[p],
 					passed:		!!(props[p] in element), 
@@ -1999,7 +1999,7 @@ Test = (function() {
 
 			var props = 'autocomplete placeholder multiple dirName'.split(' ');
 				
-			for (var p in props) {
+			for (var p = 0; p < props.length; p++) {
 				var prop = props[p].toLowerCase();
 				group.setItem({
 					id:			prop,

From df028e08d200c7a4cc6547bd61e9dcf0485a087f Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:07:05 +0200
Subject: [PATCH 120/174] Whitespace changes

---
 scripts/engine.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/engine.js b/scripts/engine.js
index 0c9abc46..5359664d 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -605,7 +605,7 @@ Test = (function() {
 			} catch (e) {
 				result = false;
 			}
-			
+
 			e.innerHTML = "<ul><li>A </li> <li>B</li></ul>";
 			result &= e.firstChild && e.firstChild.firstChild && e.firstChild.firstChild.firstChild && e.firstChild.firstChild.firstChild.nodeValue == "A ";
 		
@@ -961,6 +961,7 @@ Test = (function() {
 				document.body.removeChild(element);
 			}
 
+
 			var element = document.createElement('ol');
 			group.setItem({
 				id:		'ol',
@@ -968,7 +969,6 @@ Test = (function() {
 				value: 	1
 			});
 
-
 			var group = this.section.getGroup({
 				id:		'semantic'
 			});
@@ -2712,7 +2712,7 @@ Test = (function() {
 			if (!window.XMLHttpRequest) return;
 			
 			var xhr = new window.XMLHttpRequest();
-
+			
 			if (typeof xhr.responseType == 'undefined') return;
 								
 			var done = false;
@@ -2748,7 +2748,7 @@ Test = (function() {
 			if (!window.XMLHttpRequest) return;
 			
 			var xhr = new window.XMLHttpRequest();
-
+			
 			if (typeof xhr.responseType == 'undefined') return;
 								
 			var done = false;
@@ -2820,7 +2820,7 @@ Test = (function() {
 			if (!window.XMLHttpRequest || !window.ArrayBuffer) return;
 			
 			var xhr = new window.XMLHttpRequest();
-
+			
 			if (typeof xhr.responseType == 'undefined') return;
 								
 			var done = false;

From 9089af3465cadd343746392bd9652b1d8d8a01e2 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:07:45 +0200
Subject: [PATCH 121/174] Make the URL of loaded resources unique so they never
 are pulled from the cache

---
 scripts/engine.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/engine.js b/scripts/engine.js
index 5359664d..0924b682 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -2736,7 +2736,7 @@ Test = (function() {
 			
 			try {
 				item.startBackground();
-				xhr.open("GET", "/detect.html");
+				xhr.open("GET", "/detect.html?" + Math.random().toString(36).substr(2, 5));
 				xhr.responseType = "document";
 				xhr.send();
 			} catch (e) {
@@ -2772,7 +2772,7 @@ Test = (function() {
 			
 			try {
 				item.startBackground();
-				xhr.open("GET", "/detect.html");
+				xhr.open("GET", "/detect.html?" + Math.random().toString(36).substr(2, 5));
 				xhr.responseType = "text";
 				xhr.send();
 			} catch (e) {
@@ -2808,7 +2808,7 @@ Test = (function() {
 			
 			try {
 				item.startBackground();
-				xhr.open("GET", "/detect.html");
+				xhr.open("GET", "/detect.html?" + Math.random().toString(36).substr(2, 5));
 				xhr.responseType = "blob";
 				xhr.send();
 			} catch (e) {
@@ -2844,7 +2844,7 @@ Test = (function() {
 			
 			try {
 				item.startBackground();
-				xhr.open("GET", "/detect.html");
+				xhr.open("GET", "/detect.html?" + Math.random().toString(36).substr(2, 5));
 				xhr.responseType = "arraybuffer";
 				xhr.send();
 			} catch (e) {

From 5d732d39d1577292783e583c71a93f8bd4391701 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:08:01 +0200
Subject: [PATCH 122/174] Update the test for Notifications

---
 scripts/engine.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/engine.js b/scripts/engine.js
index 0924b682..186f5fac 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -2962,7 +2962,8 @@ Test = (function() {
 		},
 		
 		hasNotification: function() {
-			return 'Notifications' in window || 'webkitNotifications' in window || 'mozNotifications' in window || 'oNotifications' in window || 'msNotifications' in window;
+			/* W3C standard is "new Notification()", WebKit pre-standard is "window.webkitNotifications.createNotification()", Gecko pre-standard is "window.navigator.mozNotification.createNotification()" */
+      		return 'Notification' in window || 'webkitNotifications' in window || 'mozNotification' in window.navigator || 'oNotification' in window || 'msNotification' in window;
 		}
 	};			
 	

From 2fc522253d8e6aff8b063f24b69eb2cdb42b80ac Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:08:56 +0200
Subject: [PATCH 123/174] Remove newer versions of Mathon from the datafield
 blacklist

---
 scripts/engine.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/engine.js b/scripts/engine.js
index 186f5fac..9233c433 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -14,7 +14,7 @@ Test = (function() {
 		initialize: function(c) {
 			blacklists = {
 				fileField: 			Browsers.isOs('iOS', '<', '6'), 
-				dateFields:			Browsers.isBrowser('Sogou Explorer') || Browsers.isBrowser('Maxthon') || Browsers.isBrowser('UC Browser', '<', '8.6'),
+				dateFields:			Browsers.isBrowser('Sogou Explorer') || Browsers.isBrowser('Maxthon', '<', '4.0.5') || Browsers.isBrowser('UC Browser', '<', '8.6'),
 				colorField:			Browsers.isBrowser('Sogou Explorer') || Browsers.isBrowser('UC Browser'),
 				rangeField:			Browsers.isBrowser('UC Browser'),
 				numberField:		false,

From 81951910e44984a29561a23323c89d73f1880cf4 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:18:02 +0200
Subject: [PATCH 124/174] Revert "Bugfix with unknown data"

This reverts commit 63fe8be7a145f268d65f1c2e3d8ec1241d9d5d58.
---
 backend/templates/browser.html        |    6 +-
 backend/templates/feature.html        |    6 +-
 scripts/template.js                   |    4 +-
 scripts/useragents/detect.js          |   13 +-
 scripts/useragents/useragents.lib.php | 1478 ++++---------------------
 5 files changed, 253 insertions(+), 1254 deletions(-)

diff --git a/backend/templates/browser.html b/backend/templates/browser.html
index 821f20bd..e6675f27 100644
--- a/backend/templates/browser.html
+++ b/backend/templates/browser.html
@@ -90,15 +90,15 @@ <h3 data-i18n>About these scores</h3>
 										}	
 					});
 					
-				<?php if (isset($one) && $one != ''): ?> 
+				<?php if ($one != ''): ?> 
 					table.updateColumn(0, <?php echo $one; ?>);
 				<?php endif; ?>
 				
-				<?php if (isset($two) && $two != ''): ?> 
+				<?php if ($two != ''): ?> 
 					table.updateColumn(1, <?php echo $two; ?>);
 				<?php endif; ?>
 				
-				<?php if (isset($three) && $three != ''): ?> 
+				<?php if ($three != ''): ?> 
 					table.updateColumn(2, <?php echo $three; ?>);
 				<?php endif; ?>
 				
diff --git a/backend/templates/feature.html b/backend/templates/feature.html
index a91c7800..fdfdfeef 100644
--- a/backend/templates/feature.html
+++ b/backend/templates/feature.html
@@ -82,15 +82,15 @@ <h3 data-i18n>About these scores</h3>
 										}	
 					});
 					
-				<?php if (isset($one) && $one != ''): ?> 
+				<?php if ($one != ''): ?> 
 					table.updateColumn(0, <?php echo $one; ?>);
 				<?php endif; ?>
 				
-				<?php if (isset($two) && $two != ''): ?> 
+				<?php if ($two != ''): ?> 
 					table.updateColumn(1, <?php echo $two; ?>);
 				<?php endif; ?>
 				
-				<?php if (isset($three) && $three != ''): ?> 
+				<?php if ($three != ''): ?> 
 					table.updateColumn(2, <?php echo $three; ?>);
 				<?php endif; ?>
 										
diff --git a/scripts/template.js b/scripts/template.js
index bf4d6033..5af8219e 100644
--- a/scripts/template.js
+++ b/scripts/template.js
@@ -35,8 +35,8 @@
 
 
 var tim = (function(){
-    var starts  = "\\{\\{",
-        ends    = "\\}\\}",
+    var starts  = "{{",
+        ends    = "}}",
         path    = "[a-z0-9_][\\.a-z0-9_]*", // e.g. config.person.name
         pattern = new RegExp(starts + "("+ path +")" + ends, "gim"),
         undef;
diff --git a/scripts/useragents/detect.js b/scripts/useragents/detect.js
index 0853188e..354cab21 100644
--- a/scripts/useragents/detect.js
+++ b/scripts/useragents/detect.js
@@ -71,7 +71,7 @@ var UserAgents = (function(){
 		},
 		
 		valueOf: function() {
-			return parseFloat('' + this.major + '.' + ('0000' + this.minor).slice(-4) + ('0000' + this.revision).slice(-4));
+			return parseFloat('' + this.major + '.' + ('0000' + this.minor).slice(-4));
 		},
 		
 		toString: function() {
@@ -106,7 +106,6 @@ var UserAgents = (function(){
 			return version;
 		}
 	}
-	
 
  	var Detected = function() { this.initialize.apply(this, arguments) };
 	Detected.prototype = {
@@ -161,15 +160,9 @@ var UserAgents = (function(){
 			if (ua == 'Mozilla/5.0 (X11; U; Linux i686; zh-CN; rv:1.2.3.4) Gecko/') {
 				if (this.browser.name != 'UC Browser') {
 					this.browser.name = 'UC Browser';
-					this.browser.version = null;
 					this.engine.name = 'Gecko';
 				}
 				
-				if (this.os.name == 'Windows') {
-					this.os.name = '';
-					this.os.version = null;
-				}
-				
 				this.engine.name = 'Gecko';
 				this.engine.version = null;
 				
@@ -231,7 +224,7 @@ var UserAgents = (function(){
 				}
 
 
-				if (this.options.useFeatures && this.browser.mode != 'proxy') {
+				if (this.options.useFeatures) {
 					/* If it claims not to be Trident, but it is probably Trident running camouflage mode */
 					if (window.ActiveXObject) {
 						this.features.push('trident');		
@@ -292,6 +285,7 @@ var UserAgents = (function(){
 					}
 	
 	
+	
 					/* If we have an iPad that is not 768 x 1024, we have an imposter */
 					if (this.device.model == 'iPad') {
 						if ((screen.width != 0 && screen.height != 0) && (screen.width != 768 && screen.height != 1024) && (screen.width != 1024 && screen.height != 768)) {
@@ -421,5 +415,6 @@ var UserAgents = (function(){
 		}
 	};
 
+
 	return Detected;
 })();	
diff --git a/scripts/useragents/useragents.lib.php b/scripts/useragents/useragents.lib.php
index 7453ef6c..5969a520 100644
--- a/scripts/useragents/useragents.lib.php
+++ b/scripts/useragents/useragents.lib.php
@@ -34,95 +34,11 @@
 	define ('TYPE_EMULATOR', 'emulator');
 	define ('TYPE_TELEVISION', 'television');
 	define ('TYPE_CAMERA', 'camera');
-	define ('TYPE_SIGNAGE', 'signage');
-	define ('TYPE_WHITEBOARD', 'whiteboard');
-	define ('TYPE_CAR', 'car');
 	define ('TYPE_POS', 'pos');
-	define ('TYPE_BOT', 'bot');
 
 	define ('FLAG_GOOGLETV', 1);
 
 	
-	class BrowserIds {
-		static $ANDROID_BROWSERS = array(
-//			com.android.browser
-//			com.google.android.browser
-
-			'com.qihoo.browser'									=> '360 Phone Browser',
-			'net.adgjm.angel'									=> 'Angel Browser',
-			'com.apc.browser'									=> 'APC',
-			'com.baidu.browser.apps'							=> 'Baidu Browser',
-			'com.baidu.browser.inter'							=> 'Baidu Browser',
-			'com.baidu.searchbox'								=> 'Baidu Browser',
-			'com.boatbrowser.free'								=> 'Boat Browser',
-			'com.boatgo.browser'								=> 'Boat Browser Mini',
-			'com.ericsson.research.mario'						=> 'Bowser',
-			'mobi.mgeek.TunnyBrowser'							=> 'Dolphin',
-			'com.dolphin.browser.android.jp'					=> 'Dolphin',
-			'com.dolphin.browser.pad'							=> 'Dolphin',
-			'com.dolphin.browser.lab.cn'						=> 'Dolphin Beta',
-			'com.dolphin.browser.lab.en'						=> 'Dolphin Beta',
-			'com.dolphin.browser.cn'							=> 'Dolphin Mini',
-			'com.dolphin.browser.en'							=> 'Dolphin Mini',
-			'easy.browser.classic'								=> 'Easy Browser',
-			'easy.browser.com'									=> 'Easy Browser',
-			'it.blogspot.fedeveloper'							=> 'Emergency Browser',	
-			'gpc.myweb.hinet.net.PopupWeb'						=> 'Floating Browser Flux',
-			'galaxy.browser.gb.free'							=> 'Galaxy Browser',
-			'galaxy.browser.gb.pro'								=> 'Galaxy Browser',
-			'jp.ddo.pigsty.Habit_Browser'						=> 'Habit Browser',
-			'com.adsi.kioware.client.mobile.app'				=> 'KioWare Kiosk',
-			'com.vng.android.zingbrowser'						=> 'Laban',
-			'acr.browser.barebones'								=> 'Lightning Browser',
-			'com.mx.browser'									=> 'Maxthon',
-			'com.mx.browser.tablet'								=> 'Maxthon',
-			'com.fevdev.nakedbrowser'							=> 'Naked Browser',
-			'com.nhn.android.search'							=> 'Naver',
-			'com.access_company.android.nflifebrowser.lite'		=> 'NetFront LifeBrowser',
-			'com.ninesky.browser'								=> 'Ninesky',
-			'com.compal.android.browser'						=> 'Ocean Browser',
-			'com.tencent.ibibo.mtt'								=> 'One Browser',
-			'info.guardianproject.browser'						=> 'Orweb',	
-			'com.appsverse.photon'								=> 'Photon Browser',
-			'com.tencent.international.mtt'						=> 'QQ Browser',
-			'com.tencent.mobileqq'								=> 'QQ Browser',
-			'com.tencent.padbrowser'							=> 'QQ Browser',
-			'com.skyfire.consumer.browser'						=> 'Skyfire',
-			'jp.co.fenrir.android.sleipnir'						=> 'Sleipnir',
-			'jp.co.fenrir.android.sleipnir_test'				=> 'Sleipnir',
-			'com.mns.android.swing'								=> 'Swing Browser',
-			'org.tint'											=> 'Tint Browser',
-			'com.UCMobile'										=> 'UC Browser',
-			'com.UCMobile.intl'									=> 'UC Browser',
-			'com.uc.browser.hd'									=> 'UC Browser',
-			'com.uc.browser.en'									=> 'UC Browser Mini',
-			'sui.mRelease'										=> 'xScope Browser Pro',
-			'org.zirco'											=> 'Zirco Browser',
-			
-			'com.jv.falcon.pro'									=> 'Falcon Pro',
-			'com.noinnion.android.greader.readerpro'			=> 'gReader Pro',
-			'com.levelup.touiteur'								=> 'Plume',
-			'com.andrewshu.android.redditdonation'				=> 'Reddit is fun',
-			'com.sina.weibo'									=> 'Sina Weibo'
-		);
-
-		function identify($type, $model) {
-			switch($type) {
-				case 'android':		return BrowserIds::identifyList(BrowserIds::$ANDROID_BROWSERS, $model);
-			}
-
-			return false;
-		}
-		
-		function identifyList($list, $id) {
-			if (isset($list[$id])) {
-				return $list[$id];
-			}
-			
-			return false;
-		}
-	}
-	
 	class DeviceModels {
 		static $ANDROID_MODELS = array(
 			/* Generic identifiers */
@@ -137,7 +53,6 @@ class DeviceModels {
 			'Amlogic M1 reference board'				=> array( 'Amlogic', 'M1 reference board' ),
 			'AML8726M'									=> array( 'Amlogic', 'AML8726-M based device' ),
 			'vexpress a9'								=> array( 'ARM', 'Versatile Express development platform' ),
-			'sama5d3'									=> array( 'Atmel', 'SAMA5D3 based device' ),
 			'bcm7231'									=> array( 'Broadcom', 'BCM7231 based device', TYPE_TELEVISION ),
 			'bcm7425'									=> array( 'Broadcom', 'BCM7425 based device', TYPE_TELEVISION ),
 			'bcm7429'									=> array( 'Broadcom', 'BCM7429 based device', TYPE_TELEVISION ),
@@ -145,12 +60,8 @@ class DeviceModels {
 			'imx51!'									=> array( 'Freescale', 'i.MX51 based device' ),
 			'imx53!'									=> array( 'Freescale', 'i.MX53 based device' ),
 			'imx6q!'									=> array( 'Freescale', 'i.MX6Q based device' ),
-			'SABRESD-MX6DQ'								=> array( 'Freescale', 'i.MX6DQ based device' ),
 			'ODROID-A'									=> array( 'Hardkernel', 'ODROID-A developer tablet', TYPE_TABLET ),
-			'ODROID-U2'									=> array( 'Hardkernel', 'ODROID-U2 developer board' ),
 			'mfld (dv10|dv20|lw00|pr2|pr3)!'			=> array( 'Intel', 'Medfield based device' ),
-			'redhookbay'								=> array( 'Intel', 'Merrifield based device' ),
-			'Shark Bay Client platform'					=> array( 'Intel', 'Haswell based device' ),
 			'berlin bg2'								=> array( 'Marvell', 'Armada 1000 based device', TYPE_TELEVISION ),
 			'MStar Amber3'								=> array( 'MStar', 'Amber3 based device' ),
 			'Konka Amber3'								=> array( 'MStar', 'Amber3 based device' ),
@@ -158,7 +69,6 @@ class DeviceModels {
 			'bird75v2'									=> array( 'Mediatek', 'MT6575 based device' ),
 			'eagle75v1 2'								=> array( 'Mediatek', 'MT6575 based device' ),
 			'mt6575!'									=> array( 'Mediatek', 'MT6575 based device' ),		
-			'mt6589!'									=> array( 'Mediatek', 'MT6589 based device' ),		
 			'mt8658'									=> array( 'Mediatek', 'MT8658 based device' ),
 			'MBX DVBT reference board (c03ref)'			=> array( 'MXB', 'DVBT reference board', TYPE_TELEVISION ),
 			'NS115' 									=> array( 'Nufront', 'NuSmart 115 based device' ),
@@ -196,7 +106,6 @@ class DeviceModels {
 			'LogicPD Zoom2'								=> array( 'Texas Instruments', 'OMAP based device' ),
 			'omap3evm'									=> array( 'Texas Instruments', 'OMAP3 based device' ),
 			'Omap5sevm'									=> array( 'Texas Instruments', 'OMAP5 based device' ),
-			'AM335XEVM SK'								=> array( 'Texas Instruments', 'Sitara AM335 based device' ),
 			'pnx8473 kiryung'							=> array( 'Trident', 'PNX8473 based device', TYPE_TELEVISION ),
 			
 			/* Official Google development devices */
@@ -222,7 +131,7 @@ class DeviceModels {
 			'Galaxy Nexus'								=> array( 'Samsung', 'Galaxy Nexus' ),
 			'Grouper'									=> array( 'Asus', 'Nexus 7', TYPE_TABLET ),
 			'(Google )?Nexus 7!'						=> array( 'Asus', 'Nexus 7', TYPE_TABLET ),
-			'(Google )?Nexus 4!'						=> array( 'LG', 'Nexus 4' ),
+			'Nexus 4'									=> array( 'LG', 'Nexus 4' ),
 			'manta'										=> array( 'Samsung', 'Nexus 10', TYPE_TABLET ),
 			'Nexus 10'									=> array( 'Samsung', 'Nexus 10', TYPE_TABLET ),
 
@@ -231,31 +140,10 @@ class DeviceModels {
 			'BlueStacks'								=> array( 'BlueStacks', 'App Player', 'desktop' ),
 			'youwave custom'							=> array( 'Youwave', 'Android on PC', 'desktop' ),
 			'BlackBerry Runtime for Android Apps'		=> array( 'RIM', 'BlackBerry (Android Runtime)', TYPE_MOBILE ),
-			'BlackBerry Runtime for Android Apps'		=> array( 'RIM', 'BlackBerry (Android Runtime)', TYPE_MOBILE ),
-			'full Android on Microsoft Windows, pad, pc, n*books'	
-														=> array( 'SocketeQ', 'WindowsAndroid', 'desktop' ),
-
-			/* TV sticks */
-			'MK808'										=> array( null, 'MK808', TYPE_TELEVISION ),
-			'MK808B'									=> array( null, 'MK808B', TYPE_TELEVISION ),
-			'GK802'										=> array( null, 'GK802', TYPE_TELEVISION ),
-			'VEOLO'										=> array( 'A.C. Ryan', 'VEOLO Smart Android Hub', TYPE_TELEVISION ),
-			'M3 Enjoy TV Box'							=> array( 'Geniatech', 'Enjoy TV', TYPE_TELEVISION ),
-			'Rikomagic MK802'							=> array( 'Rikomagic', 'MK802', TYPE_TELEVISION ),
-			'Rikomagic MK802II'							=> array( 'Rikomagic', 'MK802 II', TYPE_TELEVISION ),
-			'Rikomagic MK802III'						=> array( 'Rikomagic', 'MK802 III', TYPE_TELEVISION ),	
-			'Rikomagic MK802IIIS'						=> array( 'Rikomagic', 'MK802 IIIS', TYPE_TELEVISION ),	
-			'XW-I8'										=> array( 'Sambao', 'XW-I8', TYPE_TELEVISION ),
-			'TCC8925 HDMI DONGLE'						=> array( 'Telechips', 'TCC8925', TYPE_TELEVISION ),
-			'TCC8930 STB EV'							=> array( 'Telechips', 'TCC8930', TYPE_TELEVISION ),
-
 			
 			/* Regular devices */
-			'BC9710A'									=> array( '3Q', 'Qoo! Q-Pad BC9710A', TYPE_TABLET ),
 			'RC0710B'									=> array( '3Q', 'Qoo! Q-Pad RC0710B', TYPE_TABLET ),
-			'QS9718C'									=> array( '3Q', 'Qoo! Q-Pad QS9718C', TYPE_TABLET ),
 			'TS1009B'									=> array( '3Q', 'Qoo! Surf Tablet TS1009B', TYPE_TABLET ),
-			'VM0711A'									=> array( '3Q', 'Qoo! Surf Tablet VM0711A', TYPE_TABLET ),
 			'aspire1000s'								=> array( 'Acer', '1000 Series', TYPE_DESKTOP ),
 			'A100'										=> array( 'Acer', 'Iconia Tab A100', TYPE_TABLET ),
 			'A101'										=> array( 'Acer', 'Iconia Tab A101', TYPE_TABLET ),
@@ -271,7 +159,6 @@ class DeviceModels {
 			'P2A700'									=> array( 'Acer', 'Iconia Tab A700', TYPE_TABLET ),
 			'A701'										=> array( 'Acer', 'Iconia Tab A701', TYPE_TABLET ),
 			'A800'										=> array( 'Acer', 'Iconia Tab A800', TYPE_TABLET ),
-			'B1-A71'									=> array( 'Acer', 'Iconia B1-A71', TYPE_TABLET ),
 			'E110'										=> array( 'Acer', 'beTouch E110' ),
 			'E120'										=> array( 'Acer', 'beTouch E120' ),
 			'E130'										=> array( 'Acer', 'beTouch E130' ),
@@ -296,77 +183,40 @@ class DeviceModels {
 			'Liquid Metal'								=> array( 'Acer', 'Liquid mt' ),
 			'Stream'									=> array( 'Acer', 'Stream' ),
 			'AK330s'									=> array( 'Acer', 'AK330s' ),
-			'T1-B'										=> array( 'Advan', 'Vandroid T1-B', TYPE_TABLET ),
-			'VegaBean!'									=> array( 'Advent', 'Vega', TYPE_TABLET ),
 			'N700'										=> array( 'aigo', 'N700', TYPE_TABLET ),
 			'M801'										=> array( 'aigo', 'M801', TYPE_TABLET ),
 			'Novo7'										=> array( 'Ainovo', 'Novo7', TYPE_TABLET ),
 			'Novo7 Aurora'								=> array( 'Ainovo', 'Novo7 Aurora', TYPE_TABLET ),
-			'Ainovo Aurora-II'							=> array( 'Ainovo', 'Novo7 Aurora II', TYPE_TABLET ),
-			'Aurora-II'									=> array( 'Ainovo', 'Novo7 Aurora II', TYPE_TABLET ),
 			'Novo7 Advanced'							=> array( 'Ainovo', 'Novo7 Advanced', TYPE_TABLET ),
 			'Novo7 Advanced2'							=> array( 'Ainovo', 'Novo7 Advanced 2', TYPE_TABLET ),
 			'Novo7 Basic'								=> array( 'Ainovo', 'Novo7 Basic', TYPE_TABLET ),
-			'NovoCrystal'								=> array( 'Ainovo', 'Novo7 Crystal', TYPE_TABLET ),
 			'Novo7 ELF'									=> array( 'Ainovo', 'Novo7 Elf', TYPE_TABLET ),
-			'ELF-II'									=> array( 'Ainovo', 'Novo7 Elf II', TYPE_TABLET ),
 			'Novo7 Fire'								=> array( 'Ainovo', 'Novo7 Fire', TYPE_TABLET ),
 			'Novo7 Flame'								=> array( 'Ainovo', 'Novo7 Flame', TYPE_TABLET ),
 			'Ainovo Flame (Nexus 7)'					=> array( 'Ainovo', 'Novo7 Flame', TYPE_TABLET ),
-			'Novo7 Legend'								=> array( 'Ainovo', 'Novo7 Legend', TYPE_TABLET ),
 			'Novo7 PALADIN'								=> array( 'Ainovo', 'Novo7 Paladin', TYPE_TABLET ),
-			'Novo7 Venus'								=> array( 'Ainovo', 'Novo7 Venus', TYPE_TABLET ),
 			'Novo8 Advanced'							=> array( 'Ainovo', 'Novo8 Advanced', TYPE_TABLET ),
-			'novo9-Spark'								=> array( 'Ainovo', 'Novo9 Spark', TYPE_TABLET ),
 			'Novo10 Hero'								=> array( 'Ainovo', 'Novo10 Hero', TYPE_TABLET ),
-			'Novo 10 Hero QuadCore'						=> array( 'Ainovo', 'Novo10 Hero', TYPE_TABLET ),
 			'one touch 890!'							=> array( 'Alcatel', 'One Touch 890' ),
 			'one touch 891!'							=> array( 'Alcatel', 'One Touch 891' ),
 			'one touch 903!'							=> array( 'Alcatel', 'One Touch 903' ),
 			'one touch 906!'							=> array( 'Alcatel', 'One Touch 906' ),
 			'one touch 908!'							=> array( 'Alcatel', 'One Touch 908' ),
-			'one touch 909!'							=> array( 'Alcatel', 'One Touch 909' ),
 			'one touch 910!'							=> array( 'Alcatel', 'One Touch 910' ),
-			'one touch 916!'							=> array( 'Alcatel', 'One Touch 916' ),
 			'one touch 918!'							=> array( 'Alcatel', 'One Touch 918' ),
-			'one touch 927!'							=> array( 'Alcatel', 'One Touch 927' ),
-			'one touch 928!'							=> array( 'Alcatel', 'One Touch 928' ),
-			'one touch 930!'							=> array( 'Alcatel', 'One Touch 930' ),
 			'one touch 979!'							=> array( 'Alcatel', 'One Touch 979' ),
 			'one touch 980!'							=> array( 'Alcatel', 'One Touch 980' ),
 			'one touch 981!'							=> array( 'Alcatel', 'One Touch 981' ),
-			'one touch 983!'							=> array( 'Alcatel', 'One Touch 983' ),
 			'one touch 985!'							=> array( 'Alcatel', 'One Touch 985' ),
 			'one touch 986!'							=> array( 'Alcatel', 'One Touch 986' ),
 			'one touch 990!'							=> array( 'Alcatel', 'One Touch 990' ),
 			'one touch 991!'							=> array( 'Alcatel', 'One Touch 991' ),
-			'one touch 992!'							=> array( 'Alcatel', 'One Touch 992' ),
 			'one touch 993!'							=> array( 'Alcatel', 'One Touch 993' ),
 			'one touch 995!'							=> array( 'Alcatel', 'One Touch 995' ),
 			'one touch 997!'							=> array( 'Alcatel', 'One Touch 997' ),
+			'Telenor OneTouch'							=> array( 'Alcatel', 'One Touch 990' ),
 			'OT 918'									=> array( 'Alcatel', 'One Touch 918' ),
-			'OT-995'									=> array( 'Alcatel', 'One Touch 995' ),
-			'one touch 4010X'							=> array( 'Alcatel', 'One Touch 4010X' ),
-			'one touch 4030D'							=> array( 'Alcatel', 'One Touch 4030D' ),
-			'one touch 4030E'							=> array( 'Alcatel', 'One Touch 4030E' ),
-			'one touch 5020A'							=> array( 'Alcatel', 'One Touch 5020A' ),
-			'one touch 5020W'							=> array( 'Alcatel', 'One Touch 5020W' ),
-			'one touch 5020X'							=> array( 'Alcatel', 'One Touch 5020X' ),
-			'one touch 5035A'							=> array( 'Alcatel', 'One Touch 5035A' ),
-			'one touch 6010X'							=> array( 'Alcatel', 'One Touch 6010X' ),
-			'one touch 6030A'							=> array( 'Alcatel', 'One Touch 6030A' ),
-			'one touch 6030X'							=> array( 'Alcatel', 'One Touch 6030X' ),
-			'one touch 6033X'							=> array( 'Alcatel', 'One Touch 6033X' ),
-			'one touch 7025D'							=> array( 'Alcatel', 'One Touch 7025D' ),
-			'one touch 7025X'							=> array( 'Alcatel', 'One Touch 7025X' ),
-			'one touch 7030L'							=> array( 'Alcatel', 'One Touch 7030L' ),
-			'one touch 7030R'							=> array( 'Alcatel', 'One Touch 7030R' ),
-			'one touch T10'								=> array( 'Alcatel', 'One Touch T10', TYPE_TABLET ),
-			'onetouch EVO7'								=> array( 'Alcatel', 'One Touch Evo 7', TYPE_TABLET ),
 			'Venture'									=> array( 'Alcatel', 'Venture' ),
-			'ALLVIEW P4i'								=> array( 'Allview', 'P4 Duo' ),
-			'Allview P5-Mini'							=> array( 'Allview', 'P5 Mini' ),
-			'A10'										=> array( 'AllWinner', 'A10', TYPE_TABLET ),
 			'Allwinner A10'								=> array( 'AllWinner', 'A10', TYPE_TABLET ),
 			'97FC'										=> array( 'AllWinner', 'A10 97FC', TYPE_TABLET ),
 			'A13-?MID!'									=> array( 'AllWinner', 'A13', TYPE_TABLET ),
@@ -375,42 +225,24 @@ class DeviceModels {
 			'KFOT'										=> array( 'Amazon', 'Kindle Fire', TYPE_TABLET ),	
 			'KFTT'										=> array( 'Amazon', 'Kindle Fire HD 7"', TYPE_TABLET ),
 			'KFJW(I|A)!'								=> array( 'Amazon', 'Kindle Fire HD 8.9"', TYPE_TABLET ),
-			'AMOI N79+'									=> array( 'Amoi', 'N79' ),
 			'AMOI N89'									=> array( 'Amoi', 'N89' ),
-			'AMOI N808'									=> array( 'Amoi', 'N808' ),
-			'AMOI N816'									=> array( 'Amoi', 'N816' ),
 			'AMOI N820'									=> array( 'Amoi', 'N820' ),
 			'AMOI N821'									=> array( 'Amoi', 'N821' ),
-			'AMOI N828'									=> array( 'Amoi', 'N828' ),
-			'AMOI N850'									=> array( 'Amoi', 'N850' ),
-			'AMOI M8228'								=> array( 'Amoi', 'M8228' ),
 			'AMD120'									=> array( 'AnyDATA', 'AnyTAB AMD120', TYPE_TABLET ),
-			'mw07'										=> array( 'AOC', 'Breeze MW07', TYPE_TABLET ),
 			'MW0711'									=> array( 'AOC', 'Breeze MW0711', TYPE_TABLET ),
 			'MW0811'									=> array( 'AOC', 'Breeze MW0811', TYPE_TABLET ),
-			'MW0812'									=> array( 'AOC', 'Breeze MW0812', TYPE_TABLET ),
 			'MW0821 V2.0'								=> array( 'AOC', 'Breeze MW0821', TYPE_TABLET ),
 			'MW0922'									=> array( 'AOC', 'Breeze MW0922', TYPE_TABLET ),
 			'AOLE 828'									=> array( 'Aole', '828' ),
-			'M19'										=> array( 'Aoson', 'M19', TYPE_TABLET ),
-			'Aoson M19'									=> array( 'Aoson', 'M19', TYPE_TABLET ),
 			'Apanda.A60!'								=> array( 'Apanda', 'A60' ),
 			'apanda-A80S'								=> array( 'Apanda', 'A80' ),
 			'Quicki-811'								=> array( 'Apollo', 'Quicki-811', TYPE_TABLET ),
-			'AN7CG2'									=> array( 'Archos', 'Arnova 7c G2', TYPE_TABLET ),
-			'AN7G3'										=> array( 'Archos', 'Arnova 7 G3', TYPE_TABLET ),
-			'AN7DG3-CP'									=> array( 'Archos', 'Arnova 7d G3', TYPE_TABLET ),
-			'AN7FG3'									=> array( 'Archos', 'Arnova 7f G3', TYPE_TABLET ),
-			'AN7HG3'									=> array( 'Archos', 'Arnova 7h G3', TYPE_TABLET ),
 			'A80KSC!'									=> array( 'Archos', 'Arnova 8', TYPE_TABLET ),
-			'AN8G3'										=> array( 'Archos', 'Arnova 8 G3', TYPE_TABLET ),
-			'AN9G2'										=> array( 'Archos', 'Arnova 9 G2', TYPE_TABLET ),
+			'AN7CG2'									=> array( 'Archos', 'Arnova 7', TYPE_TABLET ),
+			'AN7G3'										=> array( 'Archos', 'Arnova 7 G3', TYPE_TABLET ),
 			'A101B'										=> array( 'Archos', 'Arnova 10', TYPE_TABLET ),
+			'AN10BG2DT'									=> array( 'Archos', 'Arnova 10 B', TYPE_TABLET ),
 			'AN10G2'									=> array( 'Archos', 'Arnova 10 G2', TYPE_TABLET ),
-			'AN10BG2DT'									=> array( 'Archos', 'Arnova 10b G2', TYPE_TABLET ),
-			'AN10BG3'									=> array( 'Archos', 'Arnova 10b G3', TYPE_TABLET ),
-			'AN10CG3'									=> array( 'Archos', 'Arnova 10c G3', TYPE_TABLET ),
-			'AN10DG3'									=> array( 'Archos', 'Arnova 10d G3', TYPE_TABLET ),
 			'A32'										=> array( 'Archos', '32', 'media' ),
 			'A35DE'										=> array( 'Archos', '35 Smart Home Phone' ),
 			'A43'										=> array( 'Archos', '43', 'media' ),
@@ -426,19 +258,14 @@ class DeviceModels {
 			'ARCHOS 80G9'								=> array( 'Archos', '80 G9', TYPE_TABLET ),							// G9
 			'ARCHOS 101G9'								=> array( 'Archos', '101 G9', TYPE_TABLET ),						
 			'ARCHOS 97XSLG10'							=> array( 'Archos', '97 XS', TYPE_TABLET ),							// G10
-			'ARCHOS 80XSK'								=> array( 'Archos', '80 XS', TYPE_TABLET ),							// G10
 			'ARCHOS 101G10'								=> array( 'Archos', '101 XS', TYPE_TABLET ),
 			'ARCHOS 80 COBALT'							=> array( 'Archos', '80 Cobalt', TYPE_TABLET ),						// Elements
-			'ARCHOS 80 TITANIUM'						=> array( 'Archos', '80 Titanium', TYPE_TABLET ),					// Elements
 			'ARCHOS 97 CARBON'							=> array( 'Archos', '97 Carbon', TYPE_TABLET ),						// Elements
-			'ARCHOS 97 TITANIUMHD'						=> array( 'Archos', '97 Titanium HD', TYPE_TABLET ),				// Elements
-			'ARCHOS GAMEPAD'							=> array( 'Archos', 'Gamepad', TYPE_GAMING ),
 			'D9702'										=> array( 'Artes', 'D9702', TYPE_TABLET ),
 			'ASTRI'										=> array( 'ASTRI', 'e-reader', TYPE_EREADER ),
 			'eeepc'										=> array( 'Asus', 'Eee Pc' ),
 			'asus laptop'								=> array( 'Asus', 'Eee Pc' ),
 			'ME171'										=> array( 'Asus', 'Eee Pad MeMO', TYPE_TABLET ),
-			'ME172V'									=> array( 'Asus', 'MemoPad ME172V', TYPE_TABLET ),
 			'Slider SL101'								=> array( 'Asus', 'Eee Pad Slider', TYPE_TABLET ),
 			'EPAD'										=> array( 'Asus', 'Eee Pad Transformer', TYPE_TABLET ),
 			'TF101'										=> array( 'Asus', 'Eee Pad Transformer', TYPE_TABLET ),
@@ -449,20 +276,12 @@ class DeviceModels {
 			'Transformer Prime'							=> array( 'Asus', 'Eee Pad Transformer Prime', TYPE_TABLET ),
 			'(Transformer )?(Pad )?TF300(T|TG|TL)!'		=> array( 'Asus', 'Transformer Pad 300', TYPE_TABLET ),
 			'(Transformer )?(Pad )?TF700(T|K)!'			=> array( 'Asus', 'Transformer Pad Infinity 700', TYPE_TABLET ),
-			'Transformer Infinity'						=> array( 'Asus', 'Transformer Pad Infinity 700', TYPE_TABLET ),
-			'ME301T'									=> array( 'Asus', 'MemoPad ME301T', TYPE_TABLET ),
-			'ME371MG'									=> array( 'Asus', 'Fonepad K004', TYPE_TABLET ),
 			'PadFone'									=> array( 'Asus', 'Padfone', TYPE_TABLET ),
 			'PadFone 2'									=> array( 'Asus', 'Padfone 2', TYPE_TABLET ),
-			'PadFone Infinity'							=> array( 'Asus', 'Padfone Infinity', TYPE_TABLET ),
 			'OMS TTD'									=> array( 'Asus', 'Eee Pc T10' ),
 			'ASUS T20'									=> array( 'Asus', 'Eee Pc T20' ),
 			'ETBW11AA'									=> array( 'Asus', 'Tough' ),
-			'T-07B'										=> array( 'AudioSonic', 'T07B', TYPE_TABLET ),
 			'AUX V900'									=> array( 'AUX', 'V900' ),
-			'PICOpad GEW'								=> array( 'Axioo', 'Picopad GEW', TYPE_TABLET ),
-			'Axioo PICOpad GIM'							=> array( 'Axioo', 'Picopad GIM', TYPE_TABLET ),
-			'PICOpad GJT'								=> array( 'Axioo', 'Picopad GJT', TYPE_TABLET ),
 			'PICOpad-QGN'								=> array( 'Axioo', 'Picopad QGN', TYPE_TABLET ),
 			'A10 MID'									=> array( 'Azhuo', 'A10 MID', TYPE_TABLET ),
 			'NOOK'										=> array( 'Barnes & Noble', 'NOOK', TYPE_EREADER ),
@@ -475,33 +294,17 @@ class DeviceModels {
 			'(NOOK )?BNRV350!'							=> array( 'Barnes & Noble', 'NOOK Simple Touch', TYPE_EREADER ),
 			'(NOOK )?BNTV(400)!'						=> array( 'Barnes & Noble', 'NOOK HD Tablet', TYPE_EREADER ),
 			'(NOOK )?BNTV(600)!'						=> array( 'Barnes & Noble', 'NOOK HD+ Tablet', TYPE_EREADER ),
-			'Barnes & Noble Nook HD'					=> array( 'Barnes & Noble', 'NOOK HD Tablet', TYPE_EREADER ),
 			'Barnes & Noble Nook HD+'					=> array( 'Barnes & Noble', 'NOOK HD+ Tablet', TYPE_EREADER ),
 			'BenWee 5100'								=> array( 'BenWee', '5100' ),
 			'CA907AAC0G'								=> array( 'Besta', 'CA907AAC0G' ),
-			'BLU DASH 3.5'								=> array( 'BLU', 'Dash 3.5' ),
-			'BLU Quattro 4.5'							=> array( 'BLU', 'Quattro 4.5' ),
-			'BLU Quattro 4.5 HD'						=> array( 'BLU', 'Quattro 4.5 HD' ),
-			'BLU STUDIO 5.3 II'							=> array( 'BLU', 'Studio 5.3 II' ),
-			'BLU P100i'									=> array( 'BLU', 'Touch Book 7.0 Plus', TYPE_TABLET ),
 			'(BLU )?VIVO 4.3!'							=> array( 'BLU', 'Vivo 4.3' ),
-			'B3000'										=> array( 'BlueBo', 'B3000' ),
-			'JC-S9220'									=> array( 'Bmorn', 'Phone One' ),
 			'BM999'										=> array( 'Bmorn', 'BM999', TYPE_TABLET ),
 			'V11'										=> array( 'Bmorn', 'V11', TYPE_TABLET ),
 			'V99'										=> array( 'Bmorn', 'V99', TYPE_TABLET ),
-			'BOVO S-F16'								=> array( 'Bovo', 'Walker S-F16' ),
-			'S-F16'										=> array( 'Bovo', 'Walker S-F16' ),
 			'BROR W60'									=> array( 'BROR', 'W60' ),
-			'BROR W68'									=> array( 'BROR', 'W68' ),
 			'bq DaVinci'								=> array( 'bq', 'DaVinci', TYPE_TABLET ),
-			'bq Elcano'									=> array( 'bq', 'Elcano', TYPE_TABLET ),
-			'bq Edison'									=> array( 'bq', 'Edison', TYPE_TABLET ),
 			'Maxwell Lite'								=> array( 'bq', 'Maxwell Lite', TYPE_TABLET ),
-			'bq Maxwell Plus'							=> array( 'bq', 'Maxwell Plus', TYPE_TABLET ),
-			'bq Pascal 2'								=> array( 'bq', 'Pascal 2', TYPE_TABLET ),
 			'CT704'										=> array( 'Carrefour', 'CT704', TYPE_TABLET ),
-			'CT705'										=> array( 'Carrefour', 'CT705', TYPE_TABLET ),
 			'CT1002'									=> array( 'Carrefour', 'CT1002', TYPE_TABLET ),
 			'Camangi-Mangrove7'							=> array( 'Camangi', 'Mangrove 7', TYPE_TABLET ),
 			'WS171'										=> array( 'Camangi', 'WebStation', TYPE_TABLET ),
@@ -509,27 +312,16 @@ class DeviceModels {
 			'C771'										=> array( 'Casio', 'GzOne Commando' ),
 			'VX-100'									=> array( 'Casio', 'VX-100 EPOS Terminal', TYPE_POS ),
 			'CAT NOVA'									=> array( 'Cat', 'NOVA', TYPE_TABLET ),
-			'Celkon A 200'								=> array( 'Celkon', 'A200' ),
-			'Celkon CT7'								=> array( 'Celkon', 'CT7', TYPE_TABLET ),
 			'W820'										=> array( 'Cellon', 'HW-W820' ),
 			'ChangHong-Z-ME'							=> array( 'ChangHong', 'Z-me' ),
 			'Changhong H5018'							=> array( 'ChangHong', 'H5018' ),
-			'ChanghongW6'								=> array( 'ChangHong', 'W6' ),
-			'Titan TV S320'								=> array( 'Cherry Mobile', 'Titan TV S320' ),
-			'W900'										=> array( 'Cherry Mobile', 'W900' ),
-			'LA-M1'										=> array( 'Chili', 'M1' ),
-			'LA-Q1'										=> array( 'Chili', 'Q1' ),
 			'ARMM3V'									=> array( 'chinaleap', 'ARMM3V', TYPE_TABLET ),
 			'CIUS-7!'									=> array( 'Cisco', 'Cius', TYPE_TABLET ),
-			'Cloudfone Excite320e'						=> array( 'Cloudfone', 'Excite 320e' ),
-			'Thrill 430x'								=> array( 'Cloudfone', 'Thrill 430x' ),
-			'AQUILA 080-1008'							=> array( 'CMX', 'Aquila MID 080-1008', TYPE_TABLET ),
+			'CSL Spice MI300'							=> array( 'CSL', 'Spice MI300' ),
+			'CSL-MI410'									=> array( 'CSL', 'Spice MI410' ),
 			'MID1024'									=> array( 'Coby', 'Kyros MID1024', TYPE_TABLET ),
-			'MID1042'									=> array( 'Coby', 'Kyros MID1042', TYPE_TABLET ),
-			'MID1045'									=> array( 'Coby', 'Kyros MID1045', TYPE_TABLET ),
 			'MID1125'									=> array( 'Coby', 'Kyros MID1125', TYPE_TABLET ),
 			'MID1126'									=> array( 'Coby', 'Kyros MID1126', TYPE_TABLET ),
-			'MID7002'									=> array( 'Coby', 'Kyros MID7002', TYPE_TABLET ),
 			'MID7010'									=> array( 'Coby', 'Kyros MID7010', TYPE_TABLET ),
 			'MID7012'									=> array( 'Coby', 'Kyros MID7012', TYPE_TABLET ),
 			'MID7015!'									=> array( 'Coby', 'Kyros MID7015', TYPE_TABLET ),
@@ -538,21 +330,12 @@ class DeviceModels {
 			'MID7022'									=> array( 'Coby', 'Kyros MID7022', TYPE_TABLET ),
 			'MID7024'									=> array( 'Coby', 'Kyros MID7024', TYPE_TABLET ),
 			'MID7025'									=> array( 'Coby', 'Kyros MID7025', TYPE_TABLET ),
-			'MID7032'									=> array( 'Coby', 'Kyros MID7032', TYPE_TABLET ),
-			'MID7033'									=> array( 'Coby', 'Kyros MID7033', TYPE_TABLET ),
 			'MID7034'									=> array( 'Coby', 'Kyros MID7034', TYPE_TABLET ),
 			'MID7035'									=> array( 'Coby', 'Kyros MID7035', TYPE_TABLET ),
-			'MID7036'									=> array( 'Coby', 'Kyros MID7036', TYPE_TABLET ),
-			'MID7042'									=> array( 'Coby', 'Kyros MID7042', TYPE_TABLET ),
-			'MID7048'									=> array( 'Coby', 'Kyros MID7048', TYPE_TABLET ),
 			'MID7127'									=> array( 'Coby', 'Kyros MID7127', TYPE_TABLET ),
 			'MID8024'									=> array( 'Coby', 'Kyros MID8024', TYPE_TABLET ),
-			'MID8042'									=> array( 'Coby', 'Kyros MID8042', TYPE_TABLET ),
-			'MID8048'									=> array( 'Coby', 'Kyros MID8048', TYPE_TABLET ),
 			'MID8125'									=> array( 'Coby', 'Kyros MID8125', TYPE_TABLET ),
 			'MID8127'									=> array( 'Coby', 'Kyros MID8127', TYPE_TABLET ),
-			'MID9042'									=> array( 'Coby', 'Kyros MID9042', TYPE_TABLET ),
-			'MID9742'									=> array( 'Coby', 'Kyros MID9742', TYPE_TABLET ),
 			'Z71'										=> array( 'Commtiva', 'Z71' ),
 			'V-T100'									=> array( 'Commtiva', 'V-T100' ),
 			'FIH-FB0'									=> array( 'Commtiva', 'HD700'),
@@ -577,43 +360,25 @@ class DeviceModels {
 			'5855'										=> array( 'Coolpad', '5855' ),
 			'Coolpad 5860!'								=> array( 'Coolpad', '5860' ),
 			'5860'										=> array( 'Coolpad', '5860' ),
-			'5860A'										=> array( 'Coolpad', '5860A' ),
-			'5860S'										=> array( 'Coolpad', '5860S' ),
 			'Coolpad 5870'								=> array( 'Coolpad', '5870' ),
-			'5870'										=> array( 'Coolpad', '5870' ),
-			'Coolpad 5876'								=> array( 'Coolpad', '5876' ),
-			'Coolpad 5880'								=> array( 'Coolpad', '5880' ),
-			'Coolpad 5890'								=> array( 'Coolpad', '5890' ),
 			'Coolpad 7005'								=> array( 'Coolpad', '7005' ),
 			'Coolpad 7019!'								=> array( 'Coolpad', '7019' ),
-			'Coolpad 7020'								=> array( 'Coolpad', '7020' ),
-			'Coolpad 7230!'								=> array( 'Coolpad', '7230' ),
+			'Coolpad 7230'								=> array( 'Coolpad', '7230' ),
 			'7260'										=> array( 'Coolpad', '7260' ),
 			'Coolpad 7260!'								=> array( 'Coolpad', '7260' ),
 			'7266'										=> array( 'Coolpad', '7266' ),
-			'Coolpad 7290'								=> array( 'Coolpad', '7290' ),
-			'Coolpad 7295'								=> array( 'Coolpad', '7295' ),
-			'Coolpad 7728'								=> array( 'Coolpad', '7728' ),
-			'Coolpad 8010'								=> array( 'Coolpad', '8010' ),
 			'Coolpad 8013'								=> array( 'Coolpad', '8013' ),
-			'8022'										=> array( 'Coolpad', '8022' ),
 			'Coolpad 8026'								=> array( 'Coolpad', '8026' ),
-			'Coolpad 8028'								=> array( 'Coolpad', '8028' ),
-			'Coolpad 8050'								=> array( 'Coolpad', '8050' ),
-			'Coolpad -8190'								=> array( 'Coolpad', '8190' ),
 			'Coolpad 8809'								=> array( 'Coolpad', '8809' ),
 			'Coolpad 8810'								=> array( 'Coolpad', '8810' ),
 			'8810'										=> array( 'Coolpad', '8810' ),
 			'Coolpad 8811'								=> array( 'Coolpad', '8811' ),
-			'Coolpad 9070'								=> array( 'Coolpad', '9070' ),
 			'Coolpad 9120'								=> array( 'Coolpad', '9120' ),
 			'Coolpad 9900'								=> array( 'Coolpad', '9900' ),
 			'Coolpad 9960'								=> array( 'Coolpad', '9960' ),
-			'CMP741E'									=> array( 'Craig', 'CMP741e', TYPE_TABLET ),
 			'ZiiO7'										=> array( 'Creative', 'ZiiO 7', TYPE_TABLET ),
 			'ZiiLABS ZiiO7'								=> array( 'Creative', 'ZiiO 7', TYPE_TABLET ),
 			'ZiiLABS ZiiO10 '							=> array( 'Creative', 'ZiiO 10', TYPE_TABLET ),
-			'CTP828BT'									=> array( 'Cresta', 'CTP828BT', TYPE_TABLET ),
 			'CUBE K8GT A'								=> array( 'Cube', 'K8GT A', TYPE_TABLET ),
 			'CUBE K8GT B'								=> array( 'Cube', 'K8GT B', TYPE_TABLET ),
 			'K8GT C'									=> array( 'Cube', 'K8GT C', TYPE_TABLET ),
@@ -622,39 +387,26 @@ class DeviceModels {
 			'K8GT W'									=> array( 'Cube', 'K8GT W', TYPE_TABLET ),
 			'CUBE U8GT'									=> array( 'Cube', 'U8GT', TYPE_TABLET ),
 			'CUBE U9GT'									=> array( 'Cube', 'U9GT', TYPE_TABLET ),
+			'CUBE U9GT ?2!'								=> array( 'Cube', 'U9GT 2', TYPE_TABLET ),
 			'U9GT'										=> array( 'Cube', 'U9GT', TYPE_TABLET ),
+			'U9GT2!'									=> array( 'Cube', 'U9GT 2', TYPE_TABLET ),
+			'N90 From moage.com'						=> array( 'Cube', 'U9GT 2', TYPE_TABLET ),
+			'U9GT3'										=> array( 'Cube', 'U9GT 3', TYPE_TABLET ),
 			'U9GT S'									=> array( 'Cube', 'U9GT S', TYPE_TABLET ),
 			'U9GT S A'									=> array( 'Cube', 'U9GT SA', TYPE_TABLET ),
 			'U9GTS A'									=> array( 'Cube', 'U9GT SA', TYPE_TABLET ),
-			'U9GT V'									=> array( 'Cube', 'U9GT V', TYPE_TABLET ),
-			'CUBE U9GT ?2!'								=> array( 'Cube', 'U9GT2', TYPE_TABLET ),
-			'U9GT2!'									=> array( 'Cube', 'U9GT2', TYPE_TABLET ),
-			'N90 From moage.com'						=> array( 'Cube', 'U9GT2', TYPE_TABLET ),
-			'U9GT3'										=> array( 'Cube', 'U9GT3', TYPE_TABLET ),
-			'U9GT3-S'									=> array( 'Cube', 'U9GT3 S', TYPE_TABLET ),
-			'U9GT4'										=> array( 'Cube', 'U9GT4', TYPE_TABLET ),
+			'U10GT 2'									=> array( 'Cube', 'U10GT 2', TYPE_TABLET ),
 			'U10GT S'									=> array( 'Cube', 'U10GT S', TYPE_TABLET ),
-			'U10GT 2'									=> array( 'Cube', 'U10GT2', TYPE_TABLET ),
 			'CUBE U15GT'								=> array( 'Cube', 'U15GT', TYPE_TABLET ),
-			'U18GT-H'									=> array( 'Cube', 'U18GT H', TYPE_TABLET ),
-			'U18GT-W'									=> array( 'Cube', 'U18GT W', TYPE_TABLET ),
-			'U18GT2'									=> array( 'Cube', 'U18GT2', TYPE_TABLET ),
-			'U19GT-W'									=> array( 'Cube', 'U19GT W', TYPE_TABLET ),
-			'U20GT'										=> array( 'Cube', 'U20GT', TYPE_TABLET ),
+			'U18GT2'									=> array( 'Cube', 'U18GT 2', TYPE_TABLET ),
 			'U23GT'										=> array( 'Cube', 'U23GT', TYPE_TABLET ),
-			'U25GT'										=> array( 'Cube', 'U25GT', TYPE_TABLET ),
 			'U30GT-H'									=> array( 'Cube', 'U30GT H', TYPE_TABLET ),
 			'U30GT-M'									=> array( 'Cube', 'U30GT M', TYPE_TABLET ),
 			'U30GT MINI'								=> array( 'Cube', 'U30GT Mini', TYPE_TABLET ),
-			'U30GT-mini'								=> array( 'Cube', 'U30GT Mini', TYPE_TABLET ),
 			'CUBE Q7PRO'								=> array( 'Cube', 'Q7 Pro', TYPE_TABLET ),
 			'CUBE Q7PRO J'								=> array( 'Cube', 'Q7 Pro', TYPE_TABLET ),
-			'LT8088'									=> array( 'Curtis', 'Klu LT8088', TYPE_TABLET ),
 			'Cydle M7!'									=> array( 'Cydle', 'M7 MultiPAD', TYPE_TABLET ),
-			'DAKELE MC001'								=> array( 'Dakele', 'MC001' ),
-			'EVOPad R9720'								=> array( 'Dark', 'EvoPad R9720', TYPE_TABLET ),
 			'HB-100 DASAN'								=> array( 'Dasan', 'HB-100', TYPE_TELEVISION ),
-			'HB-100 DASAN Networks, Inc.'				=> array( 'Dasan', 'HB-100', TYPE_TELEVISION ),
 			'Dell Aero'									=> array( 'Dell', 'Aero' ),
 			'Dell M01M'									=> array( 'Dell', 'Mini 5', TYPE_TABLET ),
 			'Dell Streak'								=> array( 'Dell', 'Streak', TYPE_TABLET ),
@@ -670,70 +422,42 @@ class DeviceModels {
 			'Dell XCD35'								=> array( 'Dell', 'XCD35' ),
 			'XCD35'										=> array( 'Dell', 'XCD35' ),
 			'deovo V5'									=> array( 'deovo', 'V5' ),
-			'Digma iDj7'								=> array( 'Digma', 'iDj7', TYPE_TABLET ),
 			'iDx7'										=> array( 'Digma', 'iDx7', TYPE_TABLET ),
-			'iDxD7 3G'									=> array( 'Digma', 'iDxD7', TYPE_TABLET ),
 			'iDx10!'									=> array( 'Digma', 'iDx10', TYPE_TABLET ),
-			'DISTAB9000R'								=> array( 'Disgo', 'Distab 9000R', TYPE_TABLET ),
 			'DM009SH'									=> array( 'Disney Mobile', 'DM009SH' ),
 			'DM010SH'									=> array( 'Disney Mobile', 'DM010SH' ),
 			'DM012SH'									=> array( 'Disney Mobile', 'DM012SH' ),
 			'F-08D'										=> array( 'Disney Mobile', 'F-08D' ),
 			'P-05D'										=> array( 'Disney Mobile', 'P-05D' ),
-			'DJC Touchtab3'								=> array( 'DJC', 'Touchtab3', TYPE_TABLET ),
-			'DPS Dream 9'								=> array( 'DPS', 'Dream 9', TYPE_TABLET ),
 			'domod G20'									=> array( 'Domod', 'G20' ),
-			'M975'										=> array( 'Double Power', 'M975', TYPE_TABLET ),
 			'TD-1010'									=> array( 'Double Power', 'TD-1010', TYPE_TABLET ),
 			'Tablet-P27'								=> array( 'DracoTek', 'P27 Tablet', TYPE_TABLET ),
 			'ACM3066-8'									=> array( 'MY|eebo', 'Color Tablet', TYPE_TABLET ),
-			'SUPREME IPS Dual Core X200'				=> array( 'E-Boda', 'Supreme IPS Dual Core X200', TYPE_TABLET ),
-			'EBEST W16A'								=> array( 'EBEST', 'W16A' ),
-			'D709'										=> array( 'Empire Electronix', 'Tablet D709', TYPE_TABLET ),
 			'edgejr'									=> array( 'EnTourage', 'Pocket eDGe', TYPE_TABLET ),
 			'l97D'										=> array( 'EPad', 'l97D', TYPE_TABLET ),
 			'epade A360S'								=> array( 'epade', 'A360S' ),
 			'M4301'										=> array( 'Eston', 'MID M4301', 'media' ),
 			'P10AN'										=> array( 'Exper', 'Easypad P10AN', TYPE_TABLET ),
 			'Informer-702'								=> array( 'Explay', 'Informer 702', TYPE_TABLET ),
-			'informer 921'								=> array( 'Explay', 'Informer 921', TYPE_TABLET ),
 			'FIH-F0X'									=> array( 'FIH', 'F0X' ),
-			'Fly F350'									=> array( 'Fly', 'F350' ),
-			'Fly IQ237'									=> array( 'Fly', 'IQ237' ),
 			'Fly IQ245'									=> array( 'Fly', 'IQ245 Wizard' ),
-			'Fly IQ245 Plus'							=> array( 'Fly', 'IQ245 Wizard Plus' ),
-			'IQ255'										=> array( 'Fly', 'IQ255 Pride' ),
-			'FLY IQ256'									=> array( 'Fly', 'IQ256 Vogue' ),
 			'Fly IQ260'									=> array( 'Fly', 'IQ260 BlackBird' ),
-			'Fly IQ285!'								=> array( 'Fly', 'IQ285 Turbo' ),
-			'Fly IQ430'									=> array( 'Fly', 'IQ430 Evoke' ),
+			'Fly IQ285'									=> array( 'Fly', 'IQ285 Turbo' ),
 			'(Fly )?IQ440!'								=> array( 'Fly', 'IQ440 Energie' ),
 			'(Fly )?IQ441!'								=> array( 'Fly', 'IQ441 Radiance' ),
 			'Fly IQ442'									=> array( 'Fly', 'IQ442 Miracle' ),
-			'Fly IQ444'									=> array( 'Fly', 'IQ444 Diamond' ),
-			'Fly IQ446'									=> array( 'Fly', 'IQ446 Magic' ),
-			'Fly IQ450'									=> array( 'Fly', 'IQ450 Horizon' ),
-			'BC1003'									=> array( 'Flytouch', 'BC1003', TYPE_TABLET ),
 			'NABI2-NV7A'								=> array( 'Fuhu', 'NABI', TYPE_TABLET ),
 			'ISW11F'									=> array( 'Fujitsu', 'Arrows Z' ),
 			'ISW13F'									=> array( 'Fujitsu', 'Arrows Z' ),
 			'IS12F'										=> array( 'Fujitsu', 'Arrows ES' ),
 			'F-01D'										=> array( 'Fujitsu', 'Arrows Tab LTE', TYPE_TABLET ),
-			'F-02E'										=> array( 'Fujitsu', 'Arrows X' ),
 			'F-03D'										=> array( 'Fujitsu', 'Arrows Kiss' ),
-			'F-03E'										=> array( 'Fujitsu', 'Arrows Kiss' ),
-			'F-04E'										=> array( 'Fujitsu', 'Arrows V' ),
 			'F-05D'										=> array( 'Fujitsu', 'Arrows X LTE' ),
-			'F-05E'										=> array( 'Fujitsu', 'Arrows Tab' ),
 			'F-07D'										=> array( 'Fujitsu', 'Arrows μ' ),
-			'F-09D'										=> array( 'Fujitsu', 'ANTEPRIMA' ),
 			'F-10D'										=> array( 'Fujitsu', 'Arrows X F-10D' ),
 			'F-11D'										=> array( 'Fujitsu', 'Arrows Me' ),
 			'F-12C'										=> array( 'Fujitsu', 'Globetrotter' ),
-			'F-12D'										=> array( 'Fujitsu', 'F-12D' ),
 			'f12arc'									=> array( 'Fujitsu', 'F12arc' ),
-			'f12bob'									=> array( 'Fujitsu', 'F12bob' ),
-			'FJL21'										=> array( 'Fujitsu', 'Arrows ef FJL21' ),
 			'M532'										=> array( 'Fujitsu', 'Stylistic M532', TYPE_TABLET ),
 			'Garminfone'								=> array( 'Garmin-Asus', 'Garminfone' ),
 			'Garmin-Asus A10'							=> array( 'Garmin-Asus', 'Nuvifone A10' ),
@@ -744,20 +468,16 @@ class DeviceModels {
 			'Gemei G3'									=> array( 'Gemei', 'G3', TYPE_TABLET ),
 			'Gemei G9'									=> array( 'Gemei', 'G9', TYPE_TABLET ),
 			'GEM7008'									=> array( 'Gemini', 'JoyTab GEM7008', TYPE_TABLET ),
-			'GSmart G1310'								=> array( 'Gigabyte', 'GSmart G1310' ),
 			'GSmart G1317D'								=> array( 'Gigabyte', 'GSmart G1317D' ),
 			'GSmart G1342'								=> array( 'Gigabyte', 'GSmart G1342' ),
 			'GSmart G1345'								=> array( 'Gigabyte', 'GSmart G1345' ),
 			'GSmart G1362'								=> array( 'Gigabyte', 'GSmart G1362' ),
-			'GSmart GS202!'								=> array( 'Gigabyte', 'GSmart GS202' ),
 			'Gigabyte TB100'							=> array( 'Gigabyte', 'TB100', TYPE_TABLET ),
 			'GIO-GiONEE C500'							=> array( 'Gionee', 'C500' ),
 			'GIO-GiONEE C600'							=> array( 'Gionee', 'C600' ),
 			'GN100'										=> array( 'Gionee', 'GN100' ),		
 			'GN105'										=> array( 'Gionee', 'GN105' ),		
-			'GN106'										=> array( 'Gionee', 'GN106' ),		
 			'GN109'										=> array( 'Gionee', 'GN109' ),
-			'GN135'										=> array( 'Gionee', 'GN135' ),
 			'GN180'										=> array( 'Gionee', 'GN180' ),
 			'GN200'										=> array( 'Gionee', 'GN200' ),		
 			'GN205'										=> array( 'Gionee', 'GN205' ),
@@ -765,41 +485,18 @@ class DeviceModels {
 			'GN360'										=> array( 'Gionee', 'GN360' ),
 			'GN700T'									=> array( 'Gionee', 'GN700T' ),
 			'GN700W'									=> array( 'Gionee', 'GN700W' ),
-			'GN708W'									=> array( 'Gionee', 'GN708W' ),
-			'GN800'										=> array( 'Gionee', 'GN800' ),
-			'GN818T'									=> array( 'Gionee', 'GN818T' ),
 			'GN858'										=> array( 'Gionee', 'GN858' ),
-			'GN868'										=> array( 'Gionee', 'GN86N7078' ),
-			'GOCLEVER'									=> array( 'Goclever', 'TAB', TYPE_TABLET ),
-			'GOCLEVER TAB A73'							=> array( 'Goclever', 'TAB A73', TYPE_TABLET ),
-			'GOCLEVER TAB A93'							=> array( 'Goclever', 'TAB A93', TYPE_TABLET ),
 			'GOCLEVER TAB A103'							=> array( 'Goclever', 'TAB A103', TYPE_TABLET ),
 			'GOCLEVER TAB A104'							=> array( 'Goclever', 'TAB A104', TYPE_TABLET ),
-			'GOCLEVER TAB M703G'						=> array( 'Goclever', 'TAB M703G', TYPE_TABLET ),
-			'GOCLEVER TAB R106'							=> array( 'Goclever', 'TAB R106', TYPE_TABLET ),
-			'GOCLEVER TAB T76'							=> array( 'Goclever', 'TAB T76', TYPE_TABLET ),
-			'GOCLEVER TAB 9300'							=> array( 'Goclever', 'TAB 9300', TYPE_TABLET ),
-			'M758A'										=> array( 'Gpad', 'M758A', TYPE_TABLET ),
-			'GO M3'										=> array( 'GreenOrange', 'M3' ),
-			'HE-E760'									=> array( 'Haier', 'HE-E760' ),
 			'Haier-HT-I617'								=> array( 'Haier', 'HT-I617' ),
-			'HT-I617'									=> array( 'Haier', 'HT-I617' ),
 			'Haier HW-W910'								=> array( 'Haier', 'HW-W910' ),
 			'W718'										=> array( 'Haier', 'W718' ),
 			'I9220'										=> array( 'Haipai', 'I9220' ),
-			'X710d'										=> array( 'Haipai', 'X710D' ),
 			'X720D'										=> array( 'Haipai', 'X720D' ),
 			'SN10T1'									=> array( 'HANNspree', 'HANNSpad SN10T1', TYPE_TABLET ),
 			'SN10T2'									=> array( 'HANNspree', 'HANNSpad SN10T2', TYPE_TABLET ),
 			'HannsComb'									=> array( 'HANNspree', 'HANNSpad', TYPE_TABLET ),
-			'Hannspadd'									=> array( 'HANNspree', 'HANNSpad', TYPE_TABLET ),
-			'MITO A300'									=> array( 'Harga', 'MITO A300' ),
 			'X1'										=> array( 'HCL', 'ME X1', TYPE_TABLET ),
-			'Y2'										=> array( 'HCL', 'ME Y2', TYPE_TABLET ),
-			'H701'										=> array( 'Hedy', 'H701' ),
-			'9300+'										=> array( 'Hero', '9300+' ),
-			'H2000+'									=> array( 'Hero', 'H2000+' ),
-			'H9500'										=> array( 'Hero', 'H9500' ),
 			'MID Ser(ai|ia)ls!'							=> array( 'Herotab', 'C8', TYPE_TABLET ),
 			'HILIVE H7'									=> array( 'Hilive', 'H7' ),
 			'HS-7DTB6-4GB'								=> array( 'Hipstreet', '7" Aurora tablet', TYPE_TABLET ),
@@ -807,25 +504,18 @@ class DeviceModels {
 			'COSMO DUO'									=> array( 'Hiscreen', 'Cosmo DUO', TYPE_TABLET ),
 			'HS-U8'										=> array( 'Hisense', 'U8' ),
 			'HS-U950'									=> array( 'Hisense', 'U950' ),
-			'HS-U960Q'									=> array( 'Hisense', 'U960' ),
 			'HS-T92'									=> array( 'Hisense', 'T92' ),
 			'T92'										=> array( 'Hisense', 'T92' ),
-			'Hisense T92'								=> array( 'Hisense', 'T92' ),
 			'HS-T96'									=> array( 'Hisense', 'T96' ),
 			'HS-T909'									=> array( 'Hisense', 'T909' ),
-			'HS-T930'									=> array( 'Hisense', 'T930' ),
-			'HS-E830'									=> array( 'Hisense', 'E830' ),
 			'HS-E860'									=> array( 'Hisense', 'E860' ),
 			'E860'										=> array( 'Hisense', 'E860' ),
 			'HS-E910'									=> array( 'Hisense', 'E910' ),
 			'HS-E920'									=> array( 'Hisense', 'E920' ),
 			'HS-E926'									=> array( 'Hisense', 'E926' ),
-			'HS-E956Q'									=> array( 'Hisense', 'E956' ),
 			'HS-EG900'									=> array( 'Hisense', 'EG900' ),
 			'HS-EG906'									=> array( 'Hisense', 'EG906' ),
-			'HS-EG909'									=> array( 'Hisense', 'EG909' ),
 			'AD683G'									=> array( 'Hisense', 'EG909' ),
-			'HS-EG950'									=> array( 'Hisense', 'EG950' ),
 			'HS-ET919'									=> array( 'Hisense', 'ET919' ),
 			'EG968B'									=> array( 'Hisense', 'EG968B' ),
 			'HKPHONE H8-3G'								=> array( 'HKPhone', 'H8 3G' ),
@@ -842,8 +532,6 @@ class DeviceModels {
 			'HTC A810e'									=> array( 'HTC', 'ChaCha' ),
 			'HTC A9188!'								=> array( 'HTC', 'Cullinan' ),
 			'HTC Desire C'								=> array( 'HTC', 'Desire C' ),
-			'HTC H1000C'								=> array( 'HTC', 'Desire C' ),
-			'HTC A320e'									=> array( 'HTC', 'Desire C' ),
 			'HTC Desire ?HD!'							=> array( 'HTC', 'Desire HD' ),
 			'HTC A91(91|92)!'							=> array( 'HTC', 'Desire HD' ),
 			'HTC ?Desire ?S( |$)!'						=> array( 'HTC', 'Desire S' ),
@@ -856,8 +544,6 @@ class DeviceModels {
 			'HTC T328d'									=> array( 'HTC', 'Desire VC' ),
 			'HTC Desire VT'								=> array( 'HTC', 'Desire VT' ),
 			'HTC T328t'									=> array( 'HTC', 'Desire VT' ),
-			'HTC Desire ?X!'							=> array( 'HTC', 'Desire X' ),
-			'HTC T329w'									=> array( 'HTC', 'Desire X' ),
 			'HTC Desire ?Z!'							=> array( 'HTC', 'Desire Z' ),
 			'HTC Vision'								=> array( 'HTC', 'Desire Z' ),
 			'HTC A72(71|72|75)!'						=> array( 'HTC', 'Desire Z' ),
@@ -866,21 +552,19 @@ class DeviceModels {
 			'HTC A81(81|83)!'							=> array( 'HTC', 'Desire' ),
 			'HTC ?X06HT!'								=> array( 'HTC', 'Desire' ),
 			'HTC Dream'									=> array( 'HTC', 'Dream' ),
-			'HTC Droid DNA'								=> array( 'HTC', 'Droid DNA' ),
 			'HTC Droid Incredible'						=> array( 'HTC', 'Droid Incredible' ),
 			'HTC S710d'									=> array( 'HTC', 'Droid Incredible 2' ),
 			'HTC Incredible 2'							=> array( 'HTC', 'Droid Incredible 2' ),
-			'HTC ?EVO ?3D!'								=> array( 'HTC', 'EVO 3D' ),
+			'HTC EVO ?3D!'								=> array( 'HTC', 'EVO 3D' ),
 			'HTC X51(5a|5c|5d|5m)!'						=> array( 'HTC', 'EVO 3D' ),
 			'HTC EVO 4G\+!'								=> array( 'HTC', 'EVO 4G+' ),
 			'HTC X515e'									=> array( 'HTC', 'EVO 4G+' ),
 			'HTC ?EVO ?4G!'								=> array( 'HTC', 'EVO 4G' ),
 			'HTC jewel'									=> array( 'HTC', 'EVO 4G' ),
-			'HTC ?EVO ?V ?4G!'							=> array( 'HTC', 'EVO V 4G' ),
 			'HTC ?(EVO ?)?Design ?4G!'					=> array( 'HTC', 'EVO Design 4G' ),		
 			'HTC C715c'									=> array( 'HTC', 'EVO Design 4G' ),
 			'HTC EVO Shift!'							=> array( 'HTC', 'EVO Shift' ),
-			'HTC ?Explorer!'							=> array( 'HTC', 'Explorer' ),
+			'HTC Explorer!'								=> array( 'HTC', 'Explorer' ),
 			'HTC A31(0b|0e)!'							=> array( 'HTC', 'Explorer' ),
 			'HTC Flyer!'								=> array( 'HTC', 'Flyer', TYPE_TABLET ),
 			'HTC P51(0e|2|5e)!'							=> array( 'HTC', 'Flyer', TYPE_TABLET ),
@@ -900,9 +584,8 @@ class DeviceModels {
 			'HTC H3000C'								=> array( 'HTC', 'Hero' ),
 			'HTC IMAGIO'								=> array( 'HTC', 'Imagio' ),
 			'HTC Incredible'							=> array( 'HTC', 'Incredible' ),
-			'HTC Incredible CDMA'						=> array( 'HTC', 'Incredible' ),
 			'HTC Incredible ?S!'						=> array( 'HTC', 'Incredible S' ),
-			'HTC ?Vivo!'								=> array( 'HTC', 'Incredible S' ),
+			'HTC Vivo'									=> array( 'HTC', 'Incredible S' ),
 			'HTC S710e!'								=> array( 'HTC', 'Incredible S' ),
 			'HTC Innovation'							=> array( 'HTC', 'Innovation' ),
 			'HTC (HD7 )?Inspire!'						=> array( 'HTC', 'Inspire 4G' ),
@@ -910,41 +593,28 @@ class DeviceModels {
 			'HTC X920e'									=> array( 'HTC', 'J Butterfly' ),
 			'HTC Butterfly'								=> array( 'HTC', 'J Butterfly' ),
 			'HTC P715a'									=> array( 'HTC', 'Jetstream', TYPE_TABLET ),
-			'HTC PG09410'								=> array( 'HTC', 'Jetstream', TYPE_TABLET ),
 			'HTC Legend'								=> array( 'HTC', 'Legend' ),
 			'HTC Magic!'								=> array( 'HTC', 'Magic' ),
 			'HTC Sapphire'								=> array( 'HTC', 'Magic' ),
-			'HTC Merge'									=> array( 'HTC', 'Merge' ),
 			'HTC Lexikon'								=> array( 'HTC', 'Merge' ),
 			'HTC One S'									=> array( 'HTC', 'One S' ),
 			'HTC One S !'								=> array( 'HTC', 'One S' ),
 			'HTC Z(52|56)0e!'							=> array( 'HTC', 'One S' ),
 			'HTC T528d'									=> array( 'HTC', 'One SC' ),
-			'HTC T528t'									=> array( 'HTC', 'One ST' ),
 			'HTC T528w'									=> array( 'HTC', 'One SU' ),
-			'HTC One ?SV!'								=> array( 'HTC', 'One SV' ),
-			'HTC C525c'									=> array( 'HTC', 'One SV' ),
-			'HTC C525u'									=> array( 'HTC', 'One SV' ),
+			'HTC One SV'								=> array( 'HTC', 'One SV' ),
 			'HTC One V'									=> array( 'HTC', 'One V' ),
-			'HTC T120C'									=> array( 'HTC', 'One V' ),
 			'HTC T320e'									=> array( 'HTC', 'One V' ),
 			'HTC H2000C'								=> array( 'HTC', 'One V' ),
 			'HTC One VX'								=> array( 'HTC', 'One VX' ),
 			'HTC One X'									=> array( 'HTC', 'One X' ),
 			'HTC Endeavour!'							=> array( 'HTC', 'One X' ),
 			'HTC S720e'									=> array( 'HTC', 'One X' ),
-			'HTC One X S720e'							=> array( 'HTC', 'One X' ),
-			'HTC One X with Beats Audio'				=> array( 'HTC', 'One X' ),
 			'HTC One X+'								=> array( 'HTC', 'One X+' ),
 			'HTC OneXplus'								=> array( 'HTC', 'One X+' ),
 			'HTC PM63100'								=> array( 'HTC', 'One X+' ),
-			'HTC X720d'									=> array( 'HTC', 'One XC' ),
 			'HTC One XL'								=> array( 'HTC', 'One XL' ),
 			'HTC S720t'									=> array( 'HTC', 'One XT' ),
-			'HTC PN071'									=> array( 'HTC', 'One' ),
-			'HTC PN072'									=> array( 'HTC', 'One' ),
-			'HTC One 801e'								=> array( 'HTC', 'One' ),
-			'HTC One'									=> array( 'HTC', 'One' ),
 			'HTC Raider!'								=> array( 'HTC', 'Raider 4G' ),
 			'HTC Holiday'								=> array( 'HTC', 'Raider 4G' ),
 			'HTC X710(a|e|s)!'							=> array( 'HTC', 'Raider 4G' ),
@@ -972,7 +642,6 @@ class DeviceModels {
 			'HTC A3288'									=> array( 'HTC', 'Tattoo' ),
 			'HTC A9188'									=> array( 'HTC', 'Tianxi' ),
 			'HTC X310e'									=> array( 'HTC', 'Titan' ),
-			'HTC Polaris'								=> array( 'HTC', 'Touch Cruise' ),
 			'HTC DiamondII EX'							=> array( 'HTC', 'Touch Diamond II' ),
 			'HTC T7373'									=> array( 'HTC', 'Touch Pro II' ),
 			'HTC ThunderBolt( 4G)?!'					=> array( 'HTC', 'ThunderBolt'),	
@@ -980,25 +649,21 @@ class DeviceModels {
 			'HTC Velocity!'								=> array( 'HTC', 'Velocity 4G'),
 			'HTC ?Wildfire ?S!'							=> array( 'HTC', 'Wildfire S' ),	
 			'HTC .*A510(a|b|c|e)!'						=> array( 'HTC', 'Wildfire S' ),
-			'HTC ?PG762!'								=> array( 'HTC', 'Wildfire S' ),
 			'HTC Wildfire!'								=> array( 'HTC', 'Wildfire' ),
 			'HTC .*A33(33|66|80)!'						=> array( 'HTC', 'Wildfire' ),
 			'HTC A6390'									=> array( 'HTC', 'A6390' ),
 			'HTC A8180'									=> array( 'HTC', 'A8180' ),
+			'HTC PG762'									=> array( 'HTC', 'PG762' ),
 			'HTC S610d'									=> array( 'HTC', 'S610d' ),
 			'HTC S715e'									=> array( 'HTC', 'S715e' ),
 			'HTC T329t'									=> array( 'HTC', 'T329t' ),
 			'HTC Z510d'									=> array( 'HTC', 'Z510d' ),
-			'HTC GOF U'									=> array( 'HTC', 'Desire C' ),
 			'HTC VLE U'									=> array( 'HTC', 'One S' ),
 			'HTC VLE#U'									=> array( 'HTC', 'One S' ),
 			'HTC VIE U'									=> array( 'HTC', 'One S' ),
-			'HTC K2 UL'									=> array( 'HTC', 'One SV' ),
 			'HTC EVA UL'								=> array( 'HTC', 'One V' ),
-//			'HTC IMN WLJ'								
-			'HTC DLX WLJ'								=> array( 'HTC', 'J Butterfly' ),
-			'HTC DLX WL'								=> array( 'HTC', 'Droid DNA' ),
 			'HTC DLX U'									=> array( 'HTC', 'Droid DNA' ),
+			'HTC DLX WL'								=> array( 'HTC', 'Droid DNA' ),
 			'HTC6435LVW!'								=> array( 'HTC', 'Droid DNA' ),
 			'DLX'										=> array( 'HTC', 'Droid DNA' ),
 			'HTC ENR U'									=> array( 'HTC', 'One X' ),
@@ -1021,7 +686,6 @@ class DeviceModels {
 			'Evo HD2'									=> array( 'HTC', 'EVO HD' ),
 			'EVO ?3D!'									=> array( 'HTC', 'EVO 3D' ),
 			'EVO 4G'									=> array( 'HTC', 'EVO 4G' ),
-			'Evo V 4G'									=> array( 'HTC', 'EVO V 4G' ),
 			'photon'									=> array( 'HTC', 'HD mini' ),
 			'HD2'										=> array( 'HTC', 'HD2' ),
 			'NexusHD2'									=> array( 'HTC', 'HD2' ),
@@ -1036,7 +700,6 @@ class DeviceModels {
 			'Inspire 4G'								=> array( 'HTC', 'Inspire 4G' ),
 			'Legend'									=> array( 'HTC', 'Legend' ),
 			'Docomo HT-03A'								=> array( 'HTC', 'Magic' ),
-			'One S'										=> array( 'HTC', 'One S' ),
 			'One X'										=> array( 'HTC', 'One X' ),
 			'One V'										=> array( 'HTC', 'One V' ),
 			'Rezound'									=> array( 'HTC', 'Rezound' ),
@@ -1047,14 +710,12 @@ class DeviceModels {
 			'Pyramid'									=> array( 'HTC', 'Sensation' ),
 			'TripNiCE Pyramid'							=> array( 'HTC', 'Sensation' ),
 			'Click'										=> array( 'HTC', 'Tattoo' ),
-			'Vivid 4G'									=> array( 'HTC', 'Vivid 4G' ),
 			'Wildfire S!'								=> array( 'HTC', 'Wildfire S' ),
 			'Wildfire!'									=> array( 'HTC', 'Wildfire' ),
 			'Sprint APX515CKT'							=> array( 'HTC', 'EVO 3D' ),
 			'Sprint APA9292KT'							=> array( 'HTC', 'EVO 4G' ),
 			'Sprint APA7373KT'							=> array( 'HTC', 'EVO Shift 4G' ),
 			'Sprint APC715CKT'							=> array( 'HTC', 'EVO Design 4G' ),
-			'A320a'										=> array( 'HTC', 'Desire C' ),					
 			'A3380'										=> array( 'HTC', 'Wildfire' ),
 			'A6277'										=> array( 'HTC', 'Hero' ),
 			'a7272'										=> array( 'HTC', 'Desire Z' ),					
@@ -1062,18 +723,15 @@ class DeviceModels {
 			'S31HT'										=> array( 'HTC', 'Aria' ),
 			'S710d'										=> array( 'HTC', 'Droid Incredible 2' ),
 			'S710D'										=> array( 'HTC', 'Droid Incredible 2' ),
-			'T320a'										=> array( 'HTC', 'One V' ),
 			'X06HT'										=> array( 'HTC', 'Desire' ),
 			'001HT'										=> array( 'HTC', 'Desire HD' ),
 			'X325a'										=> array( 'HTC', 'One X' ),
 			'X525a'										=> array( 'HTC', 'One X+' ),
-			'X710E'										=> array( 'HTC', 'Raider 4G' ),
 			'Z520m'										=> array( 'HTC', 'One S' ),
 			'Z710'										=> array( 'HTC', 'Sensation' ),
 			'Z710e'										=> array( 'HTC', 'Sensation' ),
 			'T9199h'									=> array( 'HTC', 'T9199h' ),
 			'ADR6200'									=> array( 'HTC', 'Droid Eris' ),
-			'HTCADR6290US'								=> array( 'HTC', 'One V' ),
 			'ADR6300'									=> array( 'HTC', 'Droid Incredible' ),
 			'ADR6325!'									=> array( 'HTC', 'Merge' ),
 			'ADR6330VW'									=> array( 'HTC', 'Rhyme' ),	
@@ -1084,7 +742,7 @@ class DeviceModels {
 			'Coquettish Red'							=> array( 'HTC', 'Rezound' ),
 			'PB99400'									=> array( 'HTC', 'Desire' ),	
 			'pcdadr6350'								=> array( 'HTC', 'Droid Incredible 2' ),
-			'PC36100!'									=> array( 'HTC', 'EVO 4G' ),
+			'PC36100'									=> array( 'HTC', 'EVO 4G' ),
 			'PG06100'									=> array( 'HTC', 'EVO Shift 4G' ),
 			'PG41200'									=> array( 'HTC', 'EVO View 4G', TYPE_TABLET ),
 			'PG86100!'									=> array( 'HTC', 'EVO 3D' ),
@@ -1096,7 +754,6 @@ class DeviceModels {
 			'ISW12HT'									=> array( 'HTC', 'EVO 3D' ),
 			'ISW13HT'									=> array( 'HTC', 'J' ),
 			'HTL21'										=> array( 'HTC', 'J Butterfly' ),
-			'HTX21'										=> array( 'HTC', 'au Infobar A02' ),
 			'USCCADR6275US!'							=> array( 'HTC', 'Desire' ),
 			'USCCADR6285US!'							=> array( 'HTC', 'Hero S' ),
 			'USCCADR6325US!'							=> array( 'HTC', 'Merge' ),
@@ -1105,29 +762,21 @@ class DeviceModels {
 			'Huawei S7-312u'							=> array( 'Huawei', 'MediaPad', TYPE_TABLET ),
 			'MediaPad 7 Lite'							=> array( 'Huawei', 'MediaPad 7 Lite', TYPE_TABLET ),
 			'MediaPad 10 FHD'							=> array( 'Huawei', 'MediaPad 10', TYPE_TABLET ),
-			'Huawei A199'								=> array( 'Huawei', 'A199' ),
 			'Huawei C8500!'								=> array( 'Huawei', 'C8500' ),
 			'Huawei C8600'								=> array( 'Huawei', 'C8600' ),
 			'Huawei C8650!'								=> array( 'Huawei', 'C8650' ),
-			'Huawei C8655'								=> array( 'Huawei', 'Ascend Y201C' ),
 			'Huawei C8800'								=> array( 'Huawei', 'IDEOS X5' ),
 			'Huawei C8810'								=> array( 'Huawei', 'Ascend G300' ),
 			'Huawei C8812!'								=> array( 'Huawei', 'Ascend C8812' ),
-			'Huawei C8813!'								=> array( 'Huawei', 'Ascend C8813' ),
 			'Huawei C8825D'								=> array( 'Huawei', 'Ascend G330C' ),
-			'Huawei C8826D'								=> array( 'Huawei', 'Ascend G500C' ),
 			'Huawei C8860E'								=> array( 'Huawei', 'Honor' ),
 			'Huawei C8950D'								=> array( 'Huawei', 'Honor+' ),
 			'Huawei G300'								=> array( 'Huawei', 'Ascend G300' ),
-			'Huawei G7500'								=> array( 'Huawei', 'G7500' ),
-			'Huawei H867G'								=> array( 'Huawei', 'H867G' ),
 			'Huawei M835'								=> array( 'Huawei', 'M835' ),
 			'Huawei M860'								=> array( 'Huawei', 'Ascend' ),
 			'Huawei M920'								=> array( 'Huawei', 'M920' ),
 			'Huawei M921'								=> array( 'Huawei', 'M921' ),
 			'Huawei M931'								=> array( 'Huawei', 'M931' ),
-			'Huawei MT1-U06'							=> array( 'Huawei', 'Ascend Mate' ),
-			'Huawei MT1-T00'							=> array( 'Huawei', 'Ascend Mate' ),
 			'Huawei S8520'								=> array( 'Huawei', 'S8520' ),
 			'Huawei S8600'								=> array( 'Huawei', 'S8600' ),
 			'Huawei T8100'								=> array( 'Huawei', 'T8100' ),
@@ -1137,9 +786,7 @@ class DeviceModels {
 			'Huawei T8620'								=> array( 'Huawei', 'Ascend Y200T' ),
 			'Huawei T8828'								=> array( 'Huawei', 'Ascend G305T' ),
 			'Huawei T8830'								=> array( 'Huawei', 'Ascend G309T' ),
-			'Huawei T8833'								=> array( 'Huawei', 'Ascend Y300' ),
 			'Huawei T8950'								=> array( 'Huawei', 'Honor+' ),
-			'Huawei T8951'								=> array( 'Huawei', 'Ascend G510' ),
 			'Huawei T9200'								=> array( 'Huawei', 'Ascend P1' ),
 			'Huawei U8220'								=> array( 'Huawei', 'U8220' ),
 			'Huawei U8500'								=> array( 'Huawei', 'IDEOS X2' ),
@@ -1158,28 +805,18 @@ class DeviceModels {
 			'Huawei U8850'								=> array( 'Huawei', 'Vision' ),
 			'Huawei U8860'								=> array( 'Huawei', 'Honor' ),
 			'Huawei U8950!'								=> array( 'Huawei', 'Ascend G600' ),
-			'Huawei ?U9000!'							=> array( 'Huawei', 'Ascend X' ),
+			'Huawei ?U9000'								=> array( 'Huawei', 'Ascend X' ),
 			'Huawei U9508'								=> array( 'Huawei', 'Honor 2' ),
-			'Huawei ?U9508!'							=> array( 'Huawei', 'Honor 2 Quad-core' ),
 			'Huawei U9510!'								=> array( 'Huawei', 'Ascend D quad' ),
 			'Huawei D2-0082'							=> array( 'Huawei', 'Ascend D2' ),
-			'Huawei D2-2010'							=> array( 'Huawei', 'Ascend D2' ),
-			'Huawei P2-6011'							=> array( 'Huawei', 'Ascend P2' ),
-			'Huawei P2-6070'							=> array( 'Huawei', 'Ascend P2' ),
 			'Huawei IDEOS U8500'						=> array( 'Huawei', 'IDEOS X2' ),
 			'Huawei IDEOS U8650'						=> array( 'Huawei', 'Sonic' ),
 			'Huawei IDEOS X3'							=> array( 'Huawei', 'IDEOS X3' ),
 			'Huawei Ideos X5!'							=> array( 'Huawei', 'IDEOS X5' ),
 			'Huawei SONIC'								=> array( 'Huawei', 'Sonic' ),
 			'Huawei 8100-9'								=> array( 'Huawei', 'U8100' ),
-			'Huawei Ascend G 300'						=> array( 'Huawei', 'Ascend G300' ),
 			'Ascend G300'								=> array( 'Huawei', 'Ascend G300' ),
-			'Huawei G510!'								=> array( 'Huawei', 'Ascend G510' ),
-			'Huawei G520-5000'							=> array( 'Huawei', 'Ascend G520' ),
-			'Huawei Y210!'								=> array( 'Huawei', 'Ascend Y210' ),
-			'Huawei Y 220T'								=> array( 'Huawei', 'Ascend Y220T' ),
 			'Huawei Y300!'								=> array( 'Huawei', 'Ascend Y300' ),
-			'Huawei Y310!'								=> array( 'Huawei', 'Ascend Y310' ),
 			'Huawei Ascend X'							=> array( 'Huawei', 'Ascend X' ),
 			'FUSIONideos'								=> array( 'Huawei', 'IDEOS' ),
 			'Gnappo Ideos'								=> array( 'Huawei', 'IDEOS' ),
@@ -1191,7 +828,6 @@ class DeviceModels {
 			'Kyivstar Aqua'								=> array( 'Huawei', 'Sonic' ),
 			'Lucky Ultra Sonic U8650'					=> array( 'Huawei', 'Sonic' ),
 			'MTC Android'								=> array( 'Huawei', 'U8110' ),
-			'A01HW'										=> array( 'Huawei', 'eMobile A01HW', TYPE_TABLET ),
 			'S31HW'										=> array( 'Huawei', 'Pocket WiFi S' ),
 			'S41HW'										=> array( 'Huawei', 'Pocket WiFi S II' ),
 			'007HW'										=> array( 'Huawei', 'Vision' ),	
@@ -1207,7 +843,6 @@ class DeviceModels {
 			'C8800'										=> array( 'Huawei', 'C8800' ),
 			'C8810'										=> array( 'Huawei', 'Ascend G300C' ),
 			'C8812'										=> array( 'Huawei', 'Ascend C8812' ),
-			'CM980'										=> array( 'Huawei', 'Evolution II' ),
 			'S8600'										=> array( 'Huawei', 'S8600' ),
 			'T8620'										=> array( 'Huawei', 'Ascend Y200T' ),
 			'T8808!'									=> array( 'Huawei', 'Ascend G306T' ),
@@ -1252,99 +887,63 @@ class DeviceModels {
 			'DroniX-0.5'								=> array( 'Huawei', 'U8180' ),
 			'MTS-SP101'									=> array( 'Huawei', 'C8511' ),
 			'TSP21'										=> array( 'Huawei', 'U8110' ),
-			'HW-01E'									=> array( 'Huawei', 'Ascend HW-01E' ),	
-			'H866C'										=> array( 'Huawei', 'Ascend Y H866C' ),								
-			'A7 HD'										=> array( 'Hyundai', 'A7 HD', TYPE_TABLET ),
+			'HW-01E'									=> array( 'Huawei', 'Ascend HW-01E' ),								
 			'HYUNDAI H6'								=> array( 'Hyundai', 'Storm H6' ),
-			'HYUNDAI H8Q'								=> array( 'Hyundai', 'H8Q' ),
-			'HYUNDAI T7'								=> array( 'Hyundai', 'T7', TYPE_TABLET ),
 			'MW1031'									=> array( 'Hyundai', 'MW1031', TYPE_TABLET ),
-			'Andi3n'									=> array( 'iBall', 'Andi3n' ),
-			'iBall Andi3e'								=> array( 'iBall', 'Andi3e' ),
 			'iBall i6012'								=> array( 'iBall', 'Slide i6012', TYPE_TABLET ),
 			'iBall Slide i7011'							=> array( 'iBall', 'Slide i7011', TYPE_TABLET ),
 			'iBall Slide 3G 7334'						=> array( 'iBall', 'Slide 3G 7334', TYPE_TABLET ),
-			'AUXUS CoreX2 3G'							=> array( 'iBerry', 'Auxus CoreX2', TYPE_TABLET ),
 			'NetTAB RUNE'								=> array( 'IconBit', 'NetTab Rune', TYPE_TABLET ),
-			'NetTAB SPACE II Plus'						=> array( 'IconBit', 'NetTab Space II Plus', TYPE_TABLET ),
 			'NetTAB THOR-LE'							=> array( 'IconBit', 'NetTab Thor LE', TYPE_TABLET ),
 			'D70W'										=> array( 'Icoo', 'D70W', TYPE_TABLET ),
 			'D80'										=> array( 'Icoo', 'D80', TYPE_TABLET ),
 			'INFOBAR A01'								=> array( 'iida', 'INFOBAR A01' ),
 			'IMO S88'									=> array( 'IMO', 'Discovery S88' ),
 			'IMO S89'									=> array( 'IMO', 'Miracle S89' ),
-			'IMO S99'									=> array( 'IMO', 'Ocean S99' ),
-			'IMO S900'									=> array( 'IMO', 'Groovy S900' ),
-			'IMO X2'									=> array( 'IMO', 'Normandy X2' ),
-			'IMO X2 NORMANDY'							=> array( 'IMO', 'Normandy X2' ),
 			'M009F'										=> array( 'Infotmic', 'M009F' ),
-			'INHON PAPILIO G1'							=> array( 'Inhon', 'Papilio G1' ),
-			'innos i6'									=> array( 'Innos', 'i6' ),
 			'AZ210A'									=> array( 'Intel', 'AZ210A' ),
 			'AZ210B'									=> array( 'Intel', 'AZ210B' ),
 			'AZ510'										=> array( 'Intel', 'AZ510' ),
 			'BT210'										=> array( 'Intel', 'BT210' ),
-			'BT230'										=> array( 'Intel', 'BT230' ),
 			'BT510'										=> array( 'Intel', 'BT510' ),
 			'greenridge'								=> array( 'Intel', 'Green Ridge', TYPE_TABLET ),
 			'INQ Cloud Touch'							=> array( 'INQ', 'Cloud Touch' ),
 			'NS-13T001'									=> array( 'Insignia', 'Flex Tablet', TYPE_TABLET ),
-			'IPRO i5S'									=> array( 'IPRO', 'i5S' ),
 			'ILT-MX100'									=> array( 'iRiver', 'Tab', TYPE_TABLET ),
-			'IVIO DE38'									=> array( 'Ivio', 'DE38' ),
-			'iwoo i900'									=> array( 'iwoo', 'i900' ),
-			'JY-G1'										=> array( 'Jiayu', 'G1' ),
+			'IVIO_DE38'									=> array( 'Ivio', 'DE38' ),
 			'JY-G2'										=> array( 'Jiayu', 'G2' ),
 			'JY-G2L'									=> array( 'Jiayu', 'G2' ),
-			'Jiayu G2'									=> array( 'Jiayu', 'G2' ),
-			'Jiayu G2s'									=> array( 'Jiayu', 'G2' ),
 			'JY-G3'										=> array( 'Jiayu', 'G3' ),
-			'Jiayu G3'									=> array( 'Jiayu', 'G3' ),
 			'JT-Smart PC01'								=> array( 'Joy-IT', 'JT-Smart PC-01' ),
 			'JXD S601WIFI'								=> array( 'JXD', 'S601 WIFI', 'media' ),
-			'JXD V5200'									=> array( 'JXD', 'V5200', 'media' ),
 			'A2'										=> array( 'KakaTech', 'A2' ),
-			'Karbonn A1'								=> array( 'Karbonn', 'A1' ),
-			'Karbonn A2'								=> array( 'Karbonn', 'A2' ),
-			'Karbonn A9+'								=> array( 'Karbonn', 'A9+' ),
-			'A11'										=> array( 'Karbonn', 'A11' ),
-			'Karbonn A18'								=> array( 'Karbonn', 'A18' ),
-			'Karbonn A21!'								=> array( 'Karbonn', 'A21' ),
-			'A21'										=> array( 'Karbonn', 'A21' ),
-			'Karbonn A30'								=> array( 'Karbonn', 'A30' ),
-			'SmartTab1'									=> array( 'Karbonn', 'Smart Tab 1', TYPE_TABLET ),
+			'Karbonn A21'								=> array( 'Karbonn', 'A21' ),
 			'ST10'										=> array( 'Karbonn', 'Smart Tab 10 Cosmic', TYPE_TABLET ),
 			'D91'										=> array( 'KK', 'D91', TYPE_TABLET ),
 			'K080'										=> array( 'Kobo', 'K080', TYPE_EREADER ),
 			'W990'										=> array( 'Konka', 'W990' ),
 			'A106'										=> array( 'koobee', 'A160' ),
-			'Koobe S7 Easy tablet'						=> array( 'Koobe', 'S7 Easy tablet', TYPE_TABLET ),
 			'KPT A9'									=> array( 'KPT', 'A9' ),
 			'EV-S100'									=> array( 'Kttech', 'Take EV-S100' ),
 			'KM-E100'									=> array( 'Kttech', 'Take LTE KM-E100' ),
 			'KM-S120'									=> array( 'Kttech', 'Take 2 KM-S120' ),
 			'KM-S200'									=> array( 'Kttech', 'Take Janus KM-S200' ),
 			'KM-S220'									=> array( 'Kttech', 'Take Tachy KM-S220' ),
-			'KM-S300'									=> array( 'Kttech', 'Take HD KM-S300' ),
 			'Kyobo mirasol eReader'						=> array( 'Kyobo', 'eReader', TYPE_EREADER ),
 			'ISW11K'									=> array( 'Kyocera', 'Digno' ),
 			'KYL21'										=> array( 'Kyocera', 'Digno S' ),
-			'WX04K'										=> array( 'Kyocera', 'Digno Duo' ),
 			'JC-KSP8000'								=> array( 'Kyocera', 'Echo' ),
 			'KSP8000'									=> array( 'Kyocera', 'Echo' ),
-			'Rise'										=> array( 'Kyocera', 'Rise' ),
 			'Zio'										=> array( 'Kyocera', 'Zio' ),
 			'C5155'										=> array( 'Kyocera', 'C5155' ),
 			'C5170'										=> array( 'Kyocera', 'C5170' ),
 			'M9300'										=> array( 'Kyocera', 'M9300' ),
 			'K-Touch E619'								=> array( 'K-Touch', 'E619' ),
 			'E800'										=> array( 'K-Touch', 'E800' ),
-			'K-Touch E806'								=> array( 'K-Touch', 'E806' ),
 			'K-TouchT580'								=> array( 'K-Touch', 'T580' ),
 			'K-Touch T619'								=> array( 'K-Touch', 'T619' ),
 			'K-Touch U6'								=> array( 'K-Touch', 'U6' ),
 			'K-Touch U10'								=> array( 'K-Touch', 'U10' ),
-			'K-Touch U86'								=> array( 'K-Touch', 'U86' ),
 			'K-Touch V8'								=> array( 'K-Touch', 'V8' ),
 			'K-Touch V9'								=> array( 'K-Touch', 'V9' ),
 			'W606'										=> array( 'K-Touch', 'W606' ),
@@ -1352,173 +951,130 @@ class DeviceModels {
 			'K-Touch W621'								=> array( 'K-Touch', 'W621' ),
 			'K-Touch W650'								=> array( 'K-Touch', 'W650' ),
 			'K-Touch W658'								=> array( 'K-Touch', 'W658' ),
-			'W686'										=> array( 'K-Touch', 'W686' ),
 			'K-Touch W688'								=> array( 'K-Touch', 'W688' ),
 			'W700'										=> array( 'K-Touch', 'W700' ),
 			'K-Touch W719'								=> array( 'K-Touch', 'W719' ),
 			'W732'										=> array( 'K-Touch', 'W732' ),
 			'K-Touch W760'								=> array( 'K-Touch', 'W760' ),
-			'K-Touch W780'								=> array( 'K-Touch', 'W780' ),
 			'W800'										=> array( 'K-Touch', 'W800' ),
 			'K-Touch W806!'								=> array( 'K-Touch', 'W806' ),
 			'W806'										=> array( 'K-Touch', 'W806' ),
 			'W808'										=> array( 'K-Touch', 'W808' ),
 			'W810'										=> array( 'K-Touch', 'W810' ),
 			'W880'										=> array( 'K-Touch', 'W880' ),
-			'LAVA S12'									=> array( 'Lava', 'S12' ),
 			'XOLO A700'									=> array( 'Lava', 'XOLO A700' ),
 			'XOLO A800'									=> array( 'Lava', 'XOLO A800' ),
-			'XOLO A1000'								=> array( 'Lava', 'XOLO A1000' ),
-			'XOLO Q800'									=> array( 'Lava', 'XOLO Q800' ),
 			'Xolo X500'									=> array( 'Lava', 'XOLO X500' ),
 			'X900'										=> array( 'Lava', 'XOLO X900' ),
 			'Xolo X900'									=> array( 'Lava', 'XOLO X900' ),
-			'XOLO X1000'								=> array( 'Lava', 'XOLO X1000' ),
-			'leepoo i500'								=> array( 'Leepoo', 'i500' ),
-			'leepoo i600'								=> array( 'Leepoo', 'i600' ),
 			'LENCM900HZ'								=> array( 'Lenco', 'TAB 811', TYPE_TABLET ),
-			'Lenco TAB-1014'							=> array( 'Lenco', 'TAB 1014', TYPE_TABLET ),
 			'ThinkPad( Tablet)?!'						=> array( 'Lenovo', 'ThinkPad Tablet', TYPE_TABLET ),
-			'Lenovo A1-32AB0'							=> array( 'Lenovo', 'IdeaPad A1', TYPE_TABLET ),
 			'(Ideapad )?K1!'							=> array( 'Lenovo', 'IdeaPad K1', TYPE_TABLET ),
 			'Ideapad S10-3T'							=> array( 'Lenovo', 'IdeaPad S10-3T', TYPE_TABLET ),
-			'IdeaTab ?A1000-T!'							=> array( 'Lenovo', 'IdeaTab A1000', TYPE_TABLET ),
-			'IdeaTab ?A1107!'							=> array( 'Lenovo', 'IdeaTab A1107', TYPE_TABLET ),
-			'IdeaTab ?A2107(A-F|A-H)!'					=> array( 'Lenovo', 'IdeaTab A2107', TYPE_TABLET ),
-			'A2107A-H'									=> array( 'Lenovo', 'IdeaTab A2107', TYPE_TABLET ),
-			'IdeaTab ?A2109(A)!'						=> array( 'Lenovo', 'IdeaTab A2109', TYPE_TABLET ),
-			'IdeaTab ?A2207(A-H)!'						=> array( 'Lenovo', 'IdeaTab A2207', TYPE_TABLET ),
-			'IdeaTab ?A3000-H!'							=> array( 'Lenovo', 'IdeaTab A3000', TYPE_TABLET ),
-			'IdeaTab ?K2110(A-F)!'						=> array( 'Lenovo', 'IdeaTab K2110', TYPE_TABLET ),
-			'S2005A-H'									=> array( 'Lenovo', 'IdeaTab S2005', TYPE_TABLET ),
-			'IdeaTab ?S2007(A-D)!'						=> array( 'Lenovo', 'IdeaTab S2007', TYPE_TABLET ),
-			'IdeaTab ?S2010(A-D)!'						=> array( 'Lenovo', 'IdeaTab S2010', TYPE_TABLET ),
-			'IdeaTab ?S2109(A-F)!'						=> array( 'Lenovo', 'IdeaTab S2109', TYPE_TABLET ),
-			'IdeaTab ?S2110(AH)!'						=> array( 'Lenovo', 'IdeaTab S2110', TYPE_TABLET ),
-			'IdeaTab ?S6000-(F|H)!'							=> array( 'Lenovo', 'IdeaTab S6000', TYPE_TABLET ),
-			'IdeaTab ?V2007(A|A-D-I)!'					=> array( 'Lenovo', 'IdeaTab V2007', TYPE_TABLET ),
-			'IdeaTab ?V2010(A)!'						=> array( 'Lenovo', 'IdeaTab V2010', TYPE_TABLET ),
+			'S2005A-H'									=> array( 'Lenovo', 'S2005A' ),
+			'IdeaTab ?A2107(A-F|A-H)!'					=> array( 'Lenovo', 'IdeaTab A2107A', TYPE_TABLET ),
+			'IdeaTab ?A2109(A)!'						=> array( 'Lenovo', 'IdeaTab A2109A', TYPE_TABLET ),
+			'IdeaTab ?A2207(A-H)!'						=> array( 'Lenovo', 'IdeaTab A2207A', TYPE_TABLET ),
+			'IdeaTab ?K2110(A-F)!'						=> array( 'Lenovo', 'IdeaTab K2110A', TYPE_TABLET ),
+			'IdeaTab ?S2007(A-D)!'						=> array( 'Lenovo', 'IdeaTab S2007A', TYPE_TABLET ),
+			'IdeaTab ?S2109(A-F)!'						=> array( 'Lenovo', 'IdeaTab S2109A', TYPE_TABLET ),
+			'IdeaTab ?V2007(A|A-D-I)!'					=> array( 'Lenovo', 'IdeaTab V2007A', TYPE_TABLET ),
+			'IdeaTab ?V2010(A)!'						=> array( 'Lenovo', 'IdeaTab V2010A', TYPE_TABLET ),
 			'A1 07'										=> array( 'Lenovo', 'LePad', TYPE_TABLET ),
 			'lepad 001b'								=> array( 'Lenovo', 'LePad', TYPE_TABLET ),
 			'lepad 001n'								=> array( 'Lenovo', 'LePad', TYPE_TABLET ),
 			'(Lenovo )?3GC101!'							=> array( 'Lenovo', 'LePhone 3GC101' ),
 			'(Lenovo |Lephone )?3GW100!'				=> array( 'Lenovo', 'LePhone 3GW100' ),
 			'(Lenovo |Lephone )?3GW101!'				=> array( 'Lenovo', 'LePhone 3GW101' ),
-			'(Lenovo )?S1[- ]37AH0!'					=> array( 'Lenovo', 'LePhone S1' ),
-			'(Lenovo )?S2[- ]38A(H0|T0)!'				=> array( 'Lenovo', 'LePhone S2' ),
-			'lephone 1800'								=> array( 'Lenovo', 'LePhone 1800' ),
-			'A30t'										=> array( 'Lenovo', 'A30' ),
-			'Lenovo A60+?!'								=> array( 'Lenovo', 'A60' ),
-			'Lenovo A65'								=> array( 'Lenovo', 'A65' ),
-			'Lenovo A66t'								=> array( 'Lenovo', 'A66' ),
-			'Lenovo A68e'								=> array( 'Lenovo', 'A68' ),
-			'Lenovo A278t'								=> array( 'Lenovo', 'A278' ),
-			'Lenovo A288t'								=> array( 'Lenovo', 'A288' ),
-			'Lenovo A298t'								=> array( 'Lenovo', 'A298' ),
-			'Lenovo A300'								=> array( 'Lenovo', 'A300' ),
-			'Lenovo A326'								=> array( 'Lenovo', 'A326' ),
-			'Lenovo A356'								=> array( 'Lenovo', 'A356' ),
-			'Lenovo A365e'								=> array( 'Lenovo', 'A365' ),
-			'Lenovo A366t'								=> array( 'Lenovo', 'A366' ),
-			'Lenovo A370e'								=> array( 'Lenovo', 'A370' ),
-			'Lenovo A390!'								=> array( 'Lenovo', 'A390' ),
-			'Lenovo A500'								=> array( 'Lenovo', 'A500' ),
-			'Lenovo A520!'								=> array( 'Lenovo', 'A520' ),
-			'Lenovo A530'								=> array( 'Lenovo', 'A530' ),
-			'Lenovo A560e'								=> array( 'Lenovo', 'A560' ),
-			'Lenovo A580'								=> array( 'Lenovo', 'A580' ),
-			'Lenovo A586'								=> array( 'Lenovo', 'A586' ),
-			'Lenovo A630!'								=> array( 'Lenovo', 'A630' ),
-			'Lenovo A660'								=> array( 'Lenovo', 'A660' ),
-			'Lenovo A690'								=> array( 'Lenovo', 'A690' ),
-			'Lenovo A668t'								=> array( 'Lenovo', 'A668' ),
-			'Lenovo A698t'								=> array( 'Lenovo', 'A698' ),
-			'Lenovo A700e'								=> array( 'Lenovo', 'A700' ),
-			'Lenovo A710e'								=> array( 'Lenovo', 'A710' ),
-			'Lenovo A750'								=> array( 'Lenovo', 'A750' ),
-			'A750'										=> array( 'Lenovo', 'A750' ),	
-			'Lenovo A765!'								=> array( 'Lenovo', 'A765' ),	
-			'Lenovo A780'								=> array( 'Lenovo', 'A780' ),
-			'Lenovo A789'								=> array( 'Lenovo', 'A789' ),
-			'Lenovo A790e'								=> array( 'Lenovo', 'A790' ),
-			'Lenovo A798t'								=> array( 'Lenovo', 'A798' ),
-			'Lenovo A800'								=> array( 'Lenovo', 'A800' ),
-			'Lenovo A820!'								=> array( 'Lenovo', 'A820' ),
-			'Lenovo K800'								=> array( 'Lenovo', 'K800' ),
-			'Lenovo K860!'								=> array( 'Lenovo', 'K860' ),
-			'Lenovo P70'								=> array( 'Lenovo', 'P70' ),
-			'Lenovo P700!'								=> array( 'Lenovo', 'P700' ),
-			'Lenovo P770'								=> array( 'Lenovo', 'P770' ),
+			'Lenovo A1-32AB0'							=> array( 'Lenovo', 'LePhone A1-32AB0' ),
+			'Lenovo S1-37AH0'							=> array( 'Lenovo', 'LePhone S1-37AH0' ),
+			'S1 37AHO'									=> array( 'Lenovo', 'LePhone S1-37AH0' ),
+			'Lenovo S2-38AH0'							=> array( 'Lenovo', 'LePhone S2-38AH0' ),
+			'Lenovo S2-38AT0'							=> array( 'Lenovo', 'LePhone S2-38AT0' ),
+			'Lenovo A288t'								=> array( 'Lenovo', 'LePhone A288' ),
+			'Lenovo A300'								=> array( 'Lenovo', 'LePhone A300' ),
+			'Lenovo A326'								=> array( 'Lenovo', 'LePhone A326' ),
+			'Lenovo A365e'								=> array( 'Lenovo', 'LePhone A365' ),
+			'Lenovo A366t'								=> array( 'Lenovo', 'LePhone A366' ),
+			'Lenovo A390e'								=> array( 'Lenovo', 'LePhone A390' ),
+			'Lenovo A500'								=> array( 'Lenovo', 'LePhone A500' ),
+			'Lenovo A520!'								=> array( 'Lenovo', 'LePhone A520' ),
+			'Lenovo A560e'								=> array( 'Lenovo', 'LePhone A560' ),
+			'Lenovo A580'								=> array( 'Lenovo', 'LePhone A580' ),
+			'Lenovo A586'								=> array( 'Lenovo', 'LePhone A586' ),
+			'Lenovo A630'								=> array( 'Lenovo', 'LePhone A630' ),
+			'Lenovo A660'								=> array( 'Lenovo', 'LePhone A660' ),
+			'Lenovo A690'								=> array( 'Lenovo', 'LePhone A690' ),
+			'Lenovo A668t'								=> array( 'Lenovo', 'LePhone A668' ),
+			'Lenovo A698t'								=> array( 'Lenovo', 'LePhone A698' ),
+			'Lenovo A700e'								=> array( 'Lenovo', 'LePhone A700' ),
+			'Lenovo A710e'								=> array( 'Lenovo', 'LePhone A710' ),
+			'Lenovo A750'								=> array( 'Lenovo', 'LePhone A750' ),
+			'Lenovo A780'								=> array( 'Lenovo', 'LePhone A780' ),
+			'Lenovo A789'								=> array( 'Lenovo', 'LePhone A789' ),
+			'Lenovo A790e'								=> array( 'Lenovo', 'LePhone A790' ),
+			'Lenovo A798t'								=> array( 'Lenovo', 'LePhone A798' ),
+			'Lenovo K860'								=> array( 'Lenovo', 'LePhone K860' ),
+			'Lenovo P70'								=> array( 'Lenovo', 'LePhone P70' ),
+			'Lenovo P700!'								=> array( 'Lenovo', 'LePhone P700' ),
 			'Lenovo S560'								=> array( 'Lenovo', 'S560' ),
 			'Lenovo S680'								=> array( 'Lenovo', 'S680' ),
-			'Lenovo S686'								=> array( 'Lenovo', 'S686' ),
 			'Lenovo S720'								=> array( 'Lenovo', 'S720' ),
 			'S720i'										=> array( 'Lenovo', 'S720' ),
-			'Lenovo S760'								=> array( 'Lenovo', 'S760' ),
 			'Lenovo S850e'								=> array( 'Lenovo', 'S850' ),
-			'Lenovo S870e'								=> array( 'Lenovo', 'S870' ),
-			'Lenovo S880!'								=> array( 'Lenovo', 'S880' ),
-			'Lenovo S890'								=> array( 'Lenovo', 'S890' ),
+			'Lenovo S880'								=> array( 'Lenovo', 'S880' ),
 			'Lenovo ?S899!'								=> array( 'Lenovo', 'S899' ),
-			'Lenovo S920'								=> array( 'Lenovo', 'S920' ),
-			'ideatv A21'								=> array( 'Lenovo', 'IDEA TV', TYPE_TELEVISION ),
+			'A30t'										=> array( 'Lenovo', 'A30t' ),
+			'Lenovo A60+?!'								=> array( 'Lenovo', 'A60' ),
+			'Lenovo A65'								=> array( 'Lenovo', 'A65' ),
+			'Lenovo A66t'								=> array( 'Lenovo', 'A66t' ),
+			'Lenovo A68e'								=> array( 'Lenovo', 'A68e' ),
+			'Lenovo K800'								=> array( 'Lenovo', 'K800' ),
+			'Lenovo K860i'								=> array( 'Lenovo', 'K860' ),
 			'IDEA TV T100'								=> array( 'Lenovo', 'IDEA TV', TYPE_TELEVISION ),
 			'IDEA TV K91'								=> array( 'Lenovo', 'IDEA TV', TYPE_TELEVISION ),
 			'TC970'										=> array( 'Le Pan', 'TC970', TYPE_TABLET ),
 			'LePanII'									=> array( 'Le Pan', 'II', TYPE_TABLET ),
-			'Le Pan S'									=> array( 'Le Pan', 'S', TYPE_TABLET ),
 			'LG-C5(50|55)!'								=> array( 'LG', 'Optimus Chat' ),
 			'LG-C660!'									=> array( 'LG', 'Optimus Pro' ),
 			'LG-C710!'									=> array( 'LG', 'Aloha' ),
 			'LG-C729'									=> array( 'LG', 'DoublePlay' ),
 			'LG-C800G'									=> array( 'LG', 'Eclypse' ),
 			'LG-CX670'									=> array( 'LG', 'Optimus 3G' ),
-			'LG-D500'									=> array( 'LG', 'D500' ),
-			'LG-D700'									=> array( 'LG', 'D700' ),
-			'LG-D801'									=> array( 'LG', 'D801' ),
 			'LG-E400!'									=> array( 'LG', 'Optimus L3' ),
 			'LG-E405!'									=> array( 'LG', 'Optimus L3 Dual' ),
-			'LG-E410!'									=> array( 'LG', 'Optimus L3' ),
 			'LG-E425!'									=> array( 'LG', 'E425' ),
-			'LG-E430!'									=> array( 'LG', 'Optimus L3 II' ),
-			'LG-E435!'									=> array( 'LG', 'Optimus L3 II Dual' ),
-			'LG-E440!'									=> array( 'LG', 'E440' ),
+			'LG-E430!'									=> array( 'LG', 'E430' ),
+			'LG-E435!'									=> array( 'LG', 'E435' ),
 			'LG-E445!'									=> array( 'LG', 'E445' ),
-			'LG-E450!'									=> array( 'LG', 'Optimus L5 II' ),
-			'LG-E455!'									=> array( 'LG', 'Optimus L5 II Dual' ),
+			'LG-E450!'									=> array( 'LG', 'E450' ),
+			'LG-E455!'									=> array( 'LG', 'E455' ),
 			'LG-E460!'									=> array( 'LG', 'E460' ),
-			'LG-E470!'									=> array( 'LG', 'E470' ),
 			'LG-E510!'									=> array( 'LG', 'Optimus Hub' ),
 			'LG-E6(10|12|17)!'							=> array( 'LG', 'Optimus L5' ),
 			'LG-E615!'									=> array( 'LG', 'Optimus L5 Dual' ),
 			'LG-E720!'									=> array( 'LG', 'Optimus Chic' ),
-			'LG-E730!'									=> array( 'LG', 'Optimus Sol' ),
-			'LG-E940'									=> array( 'LG', 'Optimus G Pro' ),
+			'LG-E730'									=> array( 'LG', 'Optimus Sol' ),
 			'LG-E960'									=> array( 'LG', 'Nexus 4' ),
 			'LG-E9(70|71|73|75|76|77|78)!'				=> array( 'LG', 'Optimus G' ),
-			'LG-E980!'									=> array( 'LG', 'E980' ),
-			'LG-E988'									=> array( 'LG', 'E988' ),
+			'LG-E980!'									=> array( 'LG', 'Optimus G2' ),
 			'LG-F100!'									=> array( 'LG', 'Optimus Vu' ),
 			'LG-F120!'									=> array( 'LG', 'Optimus LTE Tag' ),
 			'LG-F160!'									=> array( 'LG', 'Optimus LTE II' ),
 			'LG-F180!'									=> array( 'LG', 'Optimus G' ),
 			'LG-F200!'									=> array( 'LG', 'Optimus Vu 2' ),
-			'LG-F240!'									=> array( 'LG', 'Optimus G Pro' ),
+			'LG-F240!'									=> array( 'LG', 'F240' ),
 			'LG-F260!'									=> array( 'LG', 'F260' ),
-			'LG-F320!'									=> array( 'LG', 'F320' ),
 			'LG-GT540!'									=> array( 'LG', 'Optimus' ),
 			'LG-GW620'									=> array( 'LG', 'GW620 Eve' ),
 			'LG-KH5200'									=> array( 'LG', 'Andro-1' ),
 			'LG-KU3700'									=> array( 'LG', 'Optimus One' ),
 			'LG-KU5400'									=> array( 'LG', 'PRADA 3.0' ),
 			'LG-KU5900'									=> array( 'LG', 'Optimus Black' ),
-			'LG-L25L'									=> array( 'LG', 'L25L' ),
-			'LG-L38C'									=> array( 'LG', 'Optimus Dynamic' ),
 			'LG-L40G'									=> array( 'LG', 'L40G' ),
 			'LG-L160L'									=> array( 'LG', 'L160L' ),
 			'LG-LG730'									=> array( 'LG', 'Venice' ),
 			'LG-LG855'									=> array( 'LG', 'Marquee' ),
-			'LG-LG870'									=> array( 'LG', 'LG870' ),
 			'LG-LS670'									=> array( 'LG', 'Optimus S' ),
 			'LG-LS696'									=> array( 'LG', 'Elite' ),
 			'LG-LS720'									=> array( 'LG', 'LS720' ),
@@ -1537,7 +1093,6 @@ class DeviceModels {
 			'LG-LW690'									=> array( 'LG', 'Optimus C' ),
 			'LG-LW770'									=> array( 'LG', 'Regard' ),
 			'LG-MS690'									=> array( 'LG', 'Optimus M' ),
-			'LGMS769'									=> array( 'LG', 'MS769' ),
 			'LG-MS770'									=> array( 'LG', 'Motion 4G' ),
 			'LG-MS790'									=> array( 'LG', 'MS790' ),
 			'LG-MS840'									=> array( 'LG', 'Connect 4G' ),
@@ -1550,13 +1105,12 @@ class DeviceModels {
 			'LG-P505!'									=> array( 'LG', 'Phoenix' ),
 			'LG-P506'									=> array( 'LG', 'Thrive' ),
 			'LG-P509'									=> array( 'LG', 'Optimus T' ),
-			'LG-P659'									=> array( 'LG', 'P659' ),
 			'LG-P6(90|98)!'								=> array( 'LG', 'Optimus Net' ),
 			'LG-P693!'									=> array( 'LG', 'P693' ),
 			'LG-P698!'									=> array( 'LG', 'Optimus Net Dual' ),
 			'LG-P7(00|05|08)!'							=> array( 'LG', 'Optimus L7' ),
-			'LG-P710!'									=> array( 'LG', 'Optimus L7 II' ),
-			'LG-P715!'									=> array( 'LG', 'Optimus L7 II Dual' ),
+			'LG-P710!'									=> array( 'LG', 'P710' ),
+			'LG-P715!'									=> array( 'LG', 'P715' ),
 			'LG-P720!'									=> array( 'LG', 'Optimus Chic' ),
 			'LG-P725'									=> array( 'LG', 'Optimus 3D Max' ),
 			'LG-P7(60|65|68|69)!'						=> array( 'LG', 'Optimus L9' ),
@@ -1587,7 +1141,6 @@ class DeviceModels {
 			'LG-VM670'									=> array( 'LG', 'Optimus V' ),
 			'LG-VM696'									=> array( 'LG', 'Optimus Elite' ),
 			'LG-VM701'									=> array( 'LG', 'Optimus Slider' ),
-			'LG-VS410!'									=> array( 'LG', 'VS410' ),
 			'LG-VS660'									=> array( 'LG', 'Vortex' ),
 			'LG-VS700'									=> array( 'LG', 'Enlighten' ),
 			'LG-VS740'									=> array( 'LG', 'Ally' ),
@@ -1602,7 +1155,7 @@ class DeviceModels {
 			'GT540'										=> array( 'LG', 'Optimus GT540' ),
 			'GW620'										=> array( 'LG', 'Eve' ),
 			'KU9500'									=> array( 'LG', 'Optimus Z' ),
-			'LGC660!'									=> array( 'LG', 'Optimus Pro' ),
+			'LGC660'									=> array( 'LG', 'Optimus Pro' ),
 			'LGL21'										=> array( 'LG', 'Optimus G' ),
 			'LGL45C'									=> array( 'LG', 'Optimus Net' ),
 			'LGL55C'									=> array( 'LG', 'Optimus Q' ),
@@ -1625,9 +1178,7 @@ class DeviceModels {
 			'L-02D'										=> array( 'LG', 'PRADA phone' ),
 			'L-02E'										=> array( 'LG', 'Optimus LIFE' ),
 			'L-04C'										=> array( 'LG', 'Optimus Chat' ),
-			'L-04E'										=> array( 'LG', 'Optimus G Pro' ),
 			'L-05D'										=> array( 'LG', 'Optimus it' ),
-			'L-05E'										=> array( 'LG', 'L-05E' ),
 			'L-06C'										=> array( 'LG', 'Optimus Pad', TYPE_TABLET ),
 			'L-06D'										=> array( 'LG', 'Optimus Vu' ),
 			'L-07C'										=> array( 'LG', 'Optimus Bright' ),
@@ -1637,12 +1188,8 @@ class DeviceModels {
 			'LG-GT540 Optimus'							=> array( 'LG', 'Optimus' ),
 			'LG-Optimus Black'							=> array( 'LG', 'Optimus Black' ),
 			'LG-Optimus V'								=> array( 'LG', 'Optimus V' ),
-			'LG-OPTIMUS HD LTE'							=> array( 'LG', 'Optimus HD' ),
-			'LG-OPTIMUS LTE HD'							=> array( 'LG', 'Optimus HD' ),
 			'Ally'										=> array( 'LG', 'Ally' ),
 			'Optimus'									=> array( 'LG', 'Optimus' ),
-			'OptimusBlack'								=> array( 'LG', 'Optimus Black' ),
-			'Optimus G'									=> array( 'LG', 'Optimus G' ),
 			'Optimus Me'								=> array( 'LG', 'Optimus Me' ),
 			'optimus me p350'							=> array( 'LG', 'Optimus Me' ),
 			'Optimus 2X'								=> array( 'LG', 'Optimus 2X' ),
@@ -1650,35 +1197,25 @@ class DeviceModels {
 			'IS11LG'									=> array( 'LG', 'Optimus X' ),
 			'Vortex'									=> array( 'LG', 'Vortex' ),
 			'LDK-ICK v1.4'								=> array( 'LG', 'Esteem' ),
-			'Prada 3.0'									=> array( 'LG', 'PRADA 3.0' ),
-			'LG-Google TV'								=> array( 'LG', 'Google TV', TYPE_TELEVISION, FLAG_GOOGLETV ),
 			'T6'										=> array( 'Malata', 'Zpad T6', TYPE_TABLET ),
 			'Malata SMBA1002'							=> array( 'Malata', 'Tablet SMB-A1002', TYPE_TABLET ),
 			'MID05V2'									=> array( 'Manta', 'Powertab MID05V2', TYPE_TABLET ),
-			'MID801'									=> array( 'Manta', 'MID801 Duo Power HD', TYPE_TABLET ),
 			'M-270'										=> array( 'Maylong', 'M-270', TYPE_TABLET ),
-			'M70'										=> array( 'Maxsun', 'M70', TYPE_TABLET ),
 			'MP705C'									=> array( 'Mediacom', 'SmartPad 705c', TYPE_TABLET ),
 			'STM712HCZ'									=> array( 'Mediacom', 'SmartPad 712c', TYPE_TABLET ),
 			'STM803HC'									=> array( 'Mediacom', 'SmartPad 810c', TYPE_TABLET ),
 			'Mediacom 810C'								=> array( 'Mediacom', 'SmartPad 810c', TYPE_TABLET ),
 			'Xteam Smartpad 810c'						=> array( 'Mediacom', 'SmartPad 810c', TYPE_TABLET ),
-			'Xteam 4.8 Smartpad 810c'					=> array( 'Mediacom', 'SmartPad 810c', TYPE_TABLET ),
 			'SmartPad810c'								=> array( 'Mediacom', 'SmartPad 810c', TYPE_TABLET ),
 			'MP810C'									=> array( 'Mediacom', 'SmartPad 810c', TYPE_TABLET ),
-			'M-MP855i'									=> array( 'Mediacom', 'SmartPad 855i', TYPE_TABLET ),
-			'SmartPad870'								=> array( 'Mediacom', 'SmartPad 870 S2', TYPE_TABLET ),
 			'M-MP875S2'									=> array( 'Mediacom', 'SmartPad 875 S2', TYPE_TABLET ),
 			'MP907C'									=> array( 'Mediacom', 'SmartPad 907c', TYPE_TABLET ),
 			'932i'										=> array( 'Mediacom', 'SmartPad 932i', TYPE_TABLET ),
-			'SmartPad970s2'								=> array( 'Mediacom', 'SmartPad 970 S2', TYPE_TABLET ),
-			'SmartPad1010i'								=> array( 'Mediacom', 'SmartPad 1010i', TYPE_TABLET ),
 			'MT7003'									=> array( 'Mediadroid', 'Imperius' ),
 			'MTK6516'									=> array( 'Mediatek', 'MTK6516' ),
 			'LIFETAB S9512'								=> array( 'Medion', 'Lifetab S9512', TYPE_TABLET ),
 			'LIFETAB P9514'								=> array( 'Medion', 'Lifetab P9514', TYPE_TABLET ),
 			'MD LIFETAB P9516'							=> array( 'Medion', 'Lifetab P9516', TYPE_TABLET ),
-			'MEDION Smartphone LIFE E3501'				=> array( 'Medion', 'Life E3501' ),
 			'MEDION LIFE P4012'							=> array( 'Medion', 'Life P4012' ),
 			'MEDION LIFE P4310'							=> array( 'Medion', 'Life P4310' ),
 			'M8'										=> array( 'Meizu', 'M8' ),
@@ -1691,14 +1228,10 @@ class DeviceModels {
 			'M032'										=> array( 'Meizu', 'MX M032' ),
 			'M040'										=> array( 'Meizu', 'M040' ),
 			'Slidepad'									=> array( 'Memup', 'Slidepad', TYPE_TABLET ),
-			'SP-A20i'									=> array( 'Мегафон', 'SP-A20i Mint' ),
-			'Micromax A25'								=> array( 'Micromax', 'A25 Smarty' ),
 			'Micromax A44'								=> array( 'Micromax', 'A44 Punk' ),
 			'A45'										=> array( 'Micromax', 'A45 Punk' ),
 			'Micromax A50'								=> array( 'Micromax', 'A50 Ninja' ),
 			'Micromax A52'								=> array( 'Micromax', 'A52 Aisha' ),
-			'A52'										=> array( 'Micromax', 'A52 Aisha' ),
-			'Micromax-Xzoom A52'						=> array( 'Micromax', 'A52 Aisha' ),
 			'Micromax A56'								=> array( 'Micromax', 'A56 Ninja 2' ),
 			'Micromax A57'								=> array( 'Micromax', 'A57 Ninja 3' ),
 			'Micromax A60'								=> array( 'Micromax', 'Andro A60' ),
@@ -1710,30 +1243,16 @@ class DeviceModels {
 			'Micromax A80'								=> array( 'Micromax', 'A80 Infinity' ),
 			'Micromax A84'								=> array( 'Micromax', 'A84' ),
 			'Micromax A85'								=> array( 'Micromax', 'A85' ),
-			'Micromax A87!'								=> array( 'Micromax', 'A87 Ninja 4' ),
-			'Micromax A89'								=> array( 'Micromax', 'A89 Ninja' ),
+			'Micromax A87'								=> array( 'Micromax', 'A87 Ninja 4' ),
 			'Micromax A90!'								=> array( 'Micromax', 'A90 Pixel' ),
-			'A90S'										=> array( 'Micromax', 'A90S Pixel' ),
 			'Micromax A100'								=> array( 'Micromax', 'A100 Canvas' ),
 			'Micromax A110'								=> array( 'Micromax', 'A110 Canvas 2' ),
-			'Micromax Canvas 2'							=> array( 'Micromax', 'A110 Canvas 2' ),
-			'Micromax A110 (Canvas 2)'					=> array( 'Micromax', 'A110 Canvas 2' ),
-			'Micromax A116'								=> array( 'Micromax', 'A116 Canvas HD' ),
-			'Micromax P250(Funbook)'					=> array( 'Micromax', 'Funbook Alpha P250', TYPE_TABLET ),
 			'Micromax P275'								=> array( 'Micromax', 'Funbook Infinity P275', TYPE_TABLET ),
 			'P300(Funbook)'								=> array( 'Micromax', 'Funbook P300', TYPE_TABLET ),
 			'Micromax P350'								=> array( 'Micromax', 'Funbook P350', TYPE_TABLET ),
 			'Micromax P500(Funbook)'					=> array( 'Micromax', 'Funbook Pro P500', TYPE_TABLET ),
-			'MioPad 6'									=> array( 'Mitac', 'MioPad 6', TYPE_TABLET ),
-			'MITO A200'									=> array( 'Mito', 'A200' ),
-			'MITO A322'									=> array( 'Mito', 'A322' ),
-			'Mobiistar Touch S01'						=> array( 'Mobiistar', 'Touch S01' ),
-			'Mobiistar Touch Kem 350'					=> array( 'Mobiistar', 'Touch Kem 350' ),
-			'edenTAB ET-701'							=> array( 'Mobile In Style', 'Eden TAB ET-701', TYPE_TABLET ),	
-			'Cynus T1'									=> array( 'Mobistel', 'Cynus T1' ),	
-			'Cynus T2'									=> array( 'Mobistel', 'Cynus T2' ),			
-			'MOGU M2'									=> array( 'Mogu', 'M2' ),				
-			'MOGU M2 ROM'								=> array( 'Mogu', 'M2' ),				
+			'Mobiistar Touch S01'						=> array( 'Mobiistar', 'Touch S01' ),	
+			'Cynus T1'									=> array( 'Mobistel', 'Cynus T1' ),				
 			'AT735'										=> array( 'Moinstone', 'AT735', TYPE_TABLET ),
 			'A853'										=> array( 'Motorola', 'Milestone' ),
 			'A953'										=> array( 'Motorola', 'Milestone 2' ),
@@ -1759,7 +1278,6 @@ class DeviceModels {
 			'ME501'										=> array( 'Motorola', 'CLIQ XT' ),
 			'ME511'										=> array( 'Motorola', 'FLIPOUT' ),
 			'ME525!'									=> array( 'Motorola', 'MOTO ME525' ),
-			'ME526!'									=> array( 'Motorola', 'DEFY+' ),
 			'ME600'										=> array( 'Motorola', 'BACKFLIP' ),
 			'ME632'										=> array( 'Motorola', 'PRO+' ),
 			'ME722'										=> array( 'Motorola', 'Milestone 2' ),
@@ -1769,10 +1287,8 @@ class DeviceModels {
 			'ME865'										=> array( 'Motorola', 'ATRIX 2' ),
 			'MT620!'									=> array( 'Motorola', 'MOTO MT620' ),
 			'MT716'										=> array( 'Motorola', 'MOTO MT716' ),
-			'MT788'										=> array( 'Motorola', 'RAZR i' ),
 			'MT810'										=> array( 'Motorola', 'MOTO MT810' ),
 			'MT870'										=> array( 'Motorola', 'MOTO MT870' ),
-			'MT887'										=> array( 'Motorola', 'RAZR V' ),
 			'MT917'										=> array( 'Motorola', 'MT917' ),
 			'MZ505'										=> array( 'Motorola', 'XOOM Family Edition', TYPE_TABLET ),
 			'MZ600'										=> array( 'Motorola', 'XOOM 4G LTE', TYPE_TABLET ),
@@ -1783,20 +1299,16 @@ class DeviceModels {
 			'MZ605'										=> array( 'Motorola', 'XOOM 3G', TYPE_TABLET ),
 			'MZ606'										=> array( 'Motorola', 'XOOM WiFi', TYPE_TABLET ),
 			'MZ607'										=> array( 'Motorola', 'XOOM 2 WiFi Media Edition', TYPE_TABLET ),
-			'MZ608'										=> array( 'Motorola', 'XOOM 2 3G Media Edition', TYPE_TABLET ),
 			'MZ609!'									=> array( 'Motorola', 'Droid XYBOARD 8.2', TYPE_TABLET ),
 			'MZ615'										=> array( 'Motorola', 'XOOM 2 WiFi', TYPE_TABLET ),
-			'MZ616'										=> array( 'Motorola', 'XOOM 2 3G', TYPE_TABLET ),
 			'MZ617!'									=> array( 'Motorola', 'Droid XYBOARD 10.1', TYPE_TABLET ),
 			'WX435'										=> array( 'Motorola', 'TRIUMPH WX435' ),
 			'WX445'										=> array( 'Motorola', 'CITRUS WX445' ),
 			'XT300'										=> array( 'Motorola', 'SPICE' ),
 			'XT301'										=> array( 'Motorola', 'MOTO XT301' ),
 			'XT303'										=> array( 'Motorola', 'MOTOSMART XT303' ),
-			'XT305'										=> array( 'Motorola', 'MOTOSMART XT305' ),
 			'XT311'										=> array( 'Motorola', 'FIRE' ),
 			'XT316'										=> array( 'Motorola', 'MOTO XT316' ),
-			'XT317'										=> array( 'Motorola', 'SPICE Key' ),
 			'XT319'										=> array( 'Motorola', 'MOTO XT319' ),
 			'XT3(20|21)!'								=> array( 'Motorola', 'DEFY Mini' ),
 			'XT389'										=> array( 'Motorola', 'MOTOSMART XT389' ),
@@ -1810,11 +1322,9 @@ class DeviceModels {
 			'XT536'										=> array( 'Motorola', 'DEFY Diana' ),	
 			'XT550'										=> array( 'Motorola', 'MOTOSMART MIX' ),	
 			'XT5(56|57)!'								=> array( 'Motorola', 'DEFY XT' ),	
-			'XT560'										=> array( 'Motorola', 'DEFY Pro' ),	
 			'XT603'										=> array( 'Motorola', 'ADMIRAL' ),
 			'XT605'										=> array( 'Motorola', 'XT605' ),	
 			'XT610'										=> array( 'Motorola', 'Droid Pro' ),
-			'XT611'										=> array( 'Motorola', 'MOTOSMART Flip' ),
 			'XT615'										=> array( 'Motorola', 'MOTO XT615' ),
 			'XT626'										=> array( 'Motorola', 'MOTO XT626' ),
 			'XT681'										=> array( 'Motorola', 'MOTO XT681' ),
@@ -1825,7 +1335,6 @@ class DeviceModels {
 			'XT702'										=> array( 'Motorola', 'MOTO XT702' ),
 			'XT711'										=> array( 'Motorola', 'MOTO XT711' ),
 			'XT720'										=> array( 'Motorola', 'Milestone' ),
-			'XT760'										=> array( 'Motorola', 'MOTO XT760' ),
 			'XT788'										=> array( 'Motorola', 'XT788' ),
 			'XT875'										=> array( 'Motorola', 'Droid Bionic' ),
 			'XT800W'									=> array( 'Motorola', 'MOTO Glam' ),
@@ -1840,11 +1349,8 @@ class DeviceModels {
 			'XT890'										=> array( 'Motorola', 'RAZR i' ),
 			'XT8(94|97)!'								=> array( 'Motorola', 'Droid 4' ),
 			'XT9(01|10)!'								=> array( 'Motorola', 'RAZR' ),
-			'XT905'										=> array( 'Motorola', 'RAZR M' ),
 			'XT907'										=> array( 'Motorola', 'Droid RAZR M' ),
 			'XT912!'									=> array( 'Motorola', 'Droid RAZR' ),
-			'XT918'										=> array( 'Motorola', 'XT918' ),
-			'XT920'										=> array( 'Motorola', 'XT920' ),
 			'XT9(23|25|26)!'							=> array( 'Motorola', 'Droid RAZR HD' ),
 			'XT928'										=> array( 'Motorola', 'XT928' ),
 			'201M'										=> array( 'Motorola', 'Droid RAZR M' ),
@@ -1882,70 +1388,48 @@ class DeviceModels {
 			'MotoroiX'									=> array( 'Motorola', 'Droid X' ),
 			'Moto Backflip'								=> array( 'Motorola', 'BACKFLIP' ),
 			'RAZR'										=> array( 'Motorola', 'RAZR' ),
-			'RAZR HD'									=> array( 'Motorola', 'RAZR HD' ),
-			'RAZR MAXX'									=> array( 'Motorola', 'RAZR MAXX' ),
 			'Triumph'									=> array( 'Motorola', 'TRIUMPH' ),
 			'Opus One'									=> array( 'Motorola', 'i1' ),
 			'Photon'									=> array( 'Motorola', 'PHOTON' ),
 			'Photon 4G'									=> array( 'Motorola', 'PHOTON 4G' ),
 			'XOOM'										=> array( 'Motorola', 'XOOM', TYPE_TABLET ),
-			'MOTOROLA XOOM MZ606'						=> array( 'Motorola', 'XOOM', TYPE_TABLET ),
 			'XOOM 2!'									=> array( 'Motorola', 'XOOM 2', TYPE_TABLET ),
 			'XOOM MZ606'								=> array( 'Motorola', 'XOOM WiFi', TYPE_TABLET ),
 			'ISW11M'									=> array( 'Motorola', 'PHOTON' ),
 			'IS12M'										=> array( 'Motorola', 'RAZR' ),
-			'MOTOROLA RAZR'								=> array( 'Motorola', 'RAZR' ),
 			'MOTWX435KT'								=> array( 'Motorola', 'TRIUMPH' ),
 			'X3-Ice MIUI XT720 Memorila Classics'		=> array( 'Motorola', 'Milestone' ),
-			'MC40N0'									=> array( 'Motorola', 'MC40', TYPE_POS ),
-			'Enjoy 7 Plus'								=> array( 'Multilaser', 'Vibe NB036', TYPE_TABLET ),
-			'MTS-SP100'									=> array( 'MTS', 'Lifewire SP 100' ),
-			'NB036'										=> array( 'Nabi', 'Kids tablet', TYPE_TABLET ),
-			'MyPhone A848 Duo'							=> array( 'MyPhone', 'A848 Duo' ),
+			'Enjoy 7 Plus'								=> array( 'MSI', 'WindPad Enjoy 7 Plus', TYPE_TABLET ),
 			'A878 Duo'									=> array( 'MyPhone', 'A878 Duo' ),
-			'MyPhone A888 Duo'							=> array( 'MyPhone', 'A888 Duo' ),
 			'A898 Duo'									=> array( 'MyPhone', 'A898 Duo' ),
-			'MyPhone A919 Duo'							=> array( 'MyPhone', 'A919 Duo' ),
 			'NABI-A'									=> array( 'Nabi', 'Kids tablet', TYPE_TABLET ),
 			'N1'										=> array( 'Newman', 'N1' ),
-			'Newman N2'									=> array( 'Newman', 'N2' ),
 			'Newpad'									=> array( 'Newsmy', 'Newpad', TYPE_TABLET ),
 			'Newpad-K97'								=> array( 'Newsmy', 'Newpad K97', TYPE_TABLET ),
-			'P7'										=> array( 'Newsmy', 'Newpad P7', TYPE_TABLET ),
 			'Newpad P9'									=> array( 'Newsmy', 'Newpad P9', TYPE_TABLET ),
 			'M-PAD N8'									=> array( 'Newsmy', 'M-pad N8', TYPE_TABLET ),
 			'LT-NA7'									=> array( 'NEC', 'LT-NA7' ),
 			'N-01D'										=> array( 'NEC', 'MEDIAS PP N-01D' ),
 			'N-04C'										=> array( 'NEC', 'MEDIAS N-04C' ),
 			'N-04D'										=> array( 'NEC', 'MEDIAS LTE N-04D' ),
-			'N-04E'										=> array( 'NEC', 'MEDIAS X N-04E' ),
 			'N-05D'										=> array( 'NEC', 'MEDIAS ES N-05D' ),
 			'N-06C'										=> array( 'NEC', 'MEDIAS WP N-06C' ),
 			'N-06D'										=> array( 'NEC', 'MEDIAS Tab N-06D', TYPE_TABLET ),
 			'N-07D'										=> array( 'NEC', 'MEDIAS X N-07D' ),
 			'101N'										=> array( 'NEC', 'MEDIAS CH Softbank 101N' ),
 			'IS11N'										=> array( 'NEC', 'MEDIAS BR IS11N' ),
-			'NEC-101S'									=> array( 'NEC', 'MEDIAS 101S' ),
-			'NEC-101T'									=> array( 'NEC', 'MEDIAS 101T' ),
 			'Nexian NX-A890'							=> array( 'Nexian', 'Journey' ),
 			'NX-A890'									=> array( 'Nexian', 'Journey' ),
 			'NX-A891'									=> array( 'Nexian', 'Ultra Journey' ),
-			'NX-A899'									=> array( 'Nexian', 'Xtreme' ),
 			'M726HC'									=> array( 'Nextbook', 'Premium 7', TYPE_EREADER ),
 			'Next7P12!'									=> array( 'Nextbook', 'Premium 7', TYPE_EREADER ),
 			'NXM726HN'									=> array( 'Nextbook', 'Premium 7', TYPE_EREADER ),
 			'NXM727KC!'									=> array( 'Nextbook', 'Premium 7', TYPE_EREADER ),
 			'Next8P12'									=> array( 'Nextbook', 'Premium 8', TYPE_EREADER ),
-			'NXM803HC'									=> array( 'Nextbook', 'Premium 8', TYPE_EREADER ),
 			'NXM803HD'									=> array( 'Nextbook', 'Premium 8', TYPE_EREADER ),
 			'DATAM803HC'								=> array( 'Nextbook', 'Premium 8', TYPE_EREADER ),
-			'NXM805ND'									=> array( 'Nextbook', 'Premium 8 SE', TYPE_EREADER ),
-			'DATAM819HD B'								=> array( 'Nextbook', 'Premium 8', TYPE_EREADER ),
-			'NXM908HC'									=> array( 'Nextbook', 'Premium 9', TYPE_EREADER ),
-			'NXM703U'									=> array( 'Nextbook', 'Next 2', TYPE_EREADER ),
 			'NXM901'									=> array( 'Nextbook', 'Next 3', TYPE_EREADER),
 			'NGM Vanity Smart'							=> array( 'NGM', 'Vanity Smart' ),
-			'i9430'										=> array( 'Ninetology', 'Insight i9430' ),
 			'Nokia N9'									=> array( 'Nokia', 'N9' ),
 			'Nokia N900'								=> array( 'Nokia', 'N900' ),
 			'Lumia800'									=> array( 'Nokia', 'Lumia 800' ),
@@ -1954,13 +1438,10 @@ class DeviceModels {
 			'Adam'										=> array( 'Notion Ink', 'ADAM', TYPE_TABLET ),
 			'P4D Sirius'								=> array( 'Nvsbl', 'P4D SIRIUS', TYPE_TABLET ),
 			'EFM710A'									=> array( 'Oblio', 'Mint 7x', TYPE_TABLET ),
-			'Loox'										=> array( 'Odys', 'Loox', TYPE_TABLET ),
 			'ODYS-Xpress'								=> array( 'Odys', 'Xpress', TYPE_TABLET ),
 			'Olivetti Olipad 100'						=> array( 'Olivetti', 'Olipad 100', TYPE_TABLET ),
 			'OP110'										=> array( 'Olivetti', 'Olipad 110', TYPE_TABLET ),
 			'ONDA MID'									=> array( 'Onda', 'MID', TYPE_TABLET ),
-			'V812 Core4'								=> array( 'Onda', 'V812 Quad Core', TYPE_TABLET ),
-			'V972 Core4'								=> array( 'Onda', 'V972 Quad Core', TYPE_TABLET ),
 			'VX580A'									=> array( 'Onda', 'VX580A', TYPE_TABLET ),
 			'VX610A'									=> array( 'Onda', 'VX610A', TYPE_TABLET ),
 			'TQ150'										=> array( 'Onda', 'TQ150' ),
@@ -1972,26 +1453,20 @@ class DeviceModels {
 			'OPPOX905'									=> array( 'Oppo', 'Find 3 X905' ),
 			'X907'										=> array( 'Oppo', 'Finder X907' ),
 			'OPPOX907'									=> array( 'Oppo', 'Finder X907' ),
-			'X909'										=> array( 'Oppo', 'Find 5 X909' ),
 			'X9015'										=> array( 'Oppo', 'Find X9015' ),
 			'OPPOX9015'									=> array( 'Oppo', 'Find X9015' ),
-			'X9017'										=> array( 'Oppo', 'Finder X9017' ),
 			'OPPOX9017'									=> array( 'Oppo', 'Finder X9017' ),
 			'R801'										=> array( 'Oppo', 'Real R801' ),
 			'OPPOR801'									=> array( 'Oppo', 'Real R801' ),
-			'OPPOR803'									=> array( 'Oppo', 'Real R803' ),
 			'OPPOR805'									=> array( 'Oppo', 'Real R805' ),
-			'R807'										=> array( 'Oppo', 'Real R807' ),
 			'OPPOR807'									=> array( 'Oppo', 'Real R807' ),
 			'OPPOR817'									=> array( 'Oppo', 'Real R817' ),
 			'OPPOT29'									=> array( 'Oppo', 'T29' ),
-			'(OPPO-?)?T703!'							=> array( 'Oppo', 'T703' ),
+			'OPPOT703'									=> array( 'Oppo', 'T703' ),
 			'OPPOU701'									=> array( 'Oppo', 'Ulike U701' ),
 			'OPPOU7011'									=> array( 'Oppo', 'Find Gemini U7011' ),
-			'OP0118-12'									=> array( 'Oregon Scientific', 'Meep!', TYPE_TABLET ),
 			'P-01D'										=> array( 'Panasonic', 'P-01D' ),
 			'P-02D'										=> array( 'Panasonic', 'Lumix Phone' ),
-			'P-02E'										=> array( 'Panasonic', 'Eluga X' ),
 			'P-04D'										=> array( 'Panasonic', 'Eluga' ),
 			'P-06D'										=> array( 'Panasonic', 'Eluga V' ),
 			'P-07C'										=> array( 'Panasonic', 'P-07C' ),
@@ -2022,8 +1497,7 @@ class DeviceModels {
 			'IM-A830!'									=> array( 'Pantech', 'Vega Racer 2' ),
 			'IM-A840!'									=> array( 'Pantech', 'Vega S5' ),
 			'IM-A850!'									=> array( 'Pantech', 'Vega R3' ),
-			'IM-A860!'									=> array( 'Pantech', 'Vega N˚ 6' ),
-			'IM-A870!'									=> array( 'Pantech', 'IM-A870' ),
+			'IM-A860!'									=> array( 'Pantech', 'IM-A860' ),
 			'IM-T100K'									=> array( 'Pantech', 'Vega N˚ 5', TYPE_TABLET ),
 			'IS06'										=> array( 'Pantech', 'SIRIUS α' ),
 			'ADR8995!'									=> array( 'Pantech', 'Breakout' ),
@@ -2038,119 +1512,57 @@ class DeviceModels {
 			'SKY IM-A600S'								=> array( 'Pantech', 'SIRIUS α' ),
 			'SKY IM-A630K'								=> array( 'Pantech', 'Izar' ),
 			'SKY IM-A650S'								=> array( 'Pantech', 'Vega' ),
-			'PTL21'										=> array( 'Pantech', 'Vega PTL21' ),
 			'IS11PT'									=> array( 'Pantech', 'Mirach IS11PT' ),
-			'FC6100'									=> array( 'Parrot', 'FC6100', TYPE_CAR ),
-			'chagall'									=> array( 'Pegatron', 'Chagall', TYPE_TABLET ),
-			'7500IPS'									=> array( 'Perfeo', '7500IPS', TYPE_TABLET ),
 			'PAT712W'									=> array( 'Perfeo', 'PAT712W', TYPE_TABLET ),
 			'X7G'										=> array( 'Pearl', 'Touchlet X7G', TYPE_TABLET ),
 			'PP4MT-7'									=> array( 'Pendo', 'Pendopad 4', TYPE_TABLET ),
-			'Penta WS802C'								=> array( 'Penta', 'T-Pad WS802C', TYPE_TABLET ),
 			'FWS710EU'									=> array( 'Phicomm', 'FWS710' ),
 			'FWS810'									=> array( 'Phicomm', 'FWS810' ),
-			'PHICOMM-i700v'								=> array( 'Phicomm', 'i700v' ),
 			'Philips PI5000'							=> array( 'Philips', 'PI5000', TYPE_TABLET ),
 			'PI7000'									=> array( 'Philips', 'PI7000', TYPE_TABLET ),
-			'Philips W336'								=> array( 'Philips', 'W336' ),
 			'Philips W536'								=> array( 'Philips', 'W536' ),
 			'Philips W626'								=> array( 'Philips', 'W626' ),
-			'W626'										=> array( 'Philips', 'W626' ),
 			'Philips W632'								=> array( 'Philips', 'W632' ),
-			'Philips W832'								=> array( 'Philips', 'W832' ),
-			'PGM 398'									=> array( 'Pixcom', 'PGM 398' ),
-			'PLOYER-MOMO'								=> array( 'Ployer', 'MOMO', TYPE_TABLET ),
 			'MOMO'										=> array( 'Ployer', 'MOMO', TYPE_TABLET ),
 			'MOMO7'										=> array( 'Ployer', 'MOMO7', TYPE_TABLET ),
 			'MOMO7 Talent'								=> array( 'Ployer', 'MOMO7 Talent', TYPE_TABLET ),
 			'MOMO8'										=> array( 'Ployer', 'MOMO8', TYPE_TABLET ),
 			'MOMO9'										=> array( 'Ployer', 'MOMO9', TYPE_TABLET ),
 			'MOMO9 STAR'								=> array( 'Ployer', 'MOMO9 Star', TYPE_TABLET ),
-			'MOMO11 bird'								=> array( 'Ployer', 'MOMO11 Bird', TYPE_TABLET ),
 			'MOMO11Speed'								=> array( 'Ployer', 'MOMO11 Speed', TYPE_TABLET ),
 			'MOMO15'									=> array( 'Ployer', 'MOMO15', TYPE_TABLET ),
 			'PocketBook A7'								=> array( 'PocketBook', 'A7', TYPE_TABLET ),
 			'PocketBook A10'							=> array( 'PocketBook', 'A10', TYPE_TABLET ),
-			'PocketBook A10 3G'							=> array( 'PocketBook', 'A10 3G', TYPE_TABLET ),
-			'Obreey SURFpad'							=> array( 'PocketBook', 'SURFpad', TYPE_TABLET ),
 			'Mobii 7'									=> array( 'Point Of View', 'Mobii 7', TYPE_TABLET ),
-			'POV-Mobii-7'								=> array( 'Point Of View', 'Mobii 7', TYPE_TABLET ),
-			'PlayTabPro'								=> array( 'Point Of View', 'PlayTabPro', TYPE_TABLET ),
-			'TAB-PLAYTABPRO'							=> array( 'Point Of View', 'PlayTabPro', TYPE_TABLET ),
-			'POV TAB-PROTAB25!'							=> array( 'Point Of View', 'ProTab 25', TYPE_TABLET ),
-			'POV TAB-PROTAB26!'							=> array( 'Point Of View', 'ProTab 26', TYPE_TABLET ),
-			'POV TAB-PROTAB30!'							=> array( 'Point Of View', 'ProTab 30', TYPE_TABLET ),
-			'TAB-PROTAB2XXL(4)'							=> array( 'Point Of View', 'ProTab2 XXL', TYPE_TABLET ),
-			'POV TAB NAVI7 3G M'						=> array( 'Point Of View', 'Onyx 507', TYPE_TABLET ),
-			'POV TV-HDMI-200BT'							=> array( 'Point Of View', 'Smart TV', TYPE_TELEVISION ),
-			'POV TV-HDMI-KB-01'							=> array( 'Point Of View', 'Smart TV', TYPE_TELEVISION ),
+			'POV TAB-PROTAB30-IPS10'					=> array( 'Point Of View', 'ProTab 30', TYPE_TABLET ),
 			'MIDC409'									=> array( 'Polaroid', 'Diamond III', TYPE_TABLET ),
 			'PMID4311'									=> array( 'Polaroid', 'PMID 4311', TYPE_TABLET ),
 			'PMID701C'									=> array( 'Polaroid', 'PMID 701c', TYPE_TABLET ),
-			'POLY PAD 9708HD'							=> array( 'Polypad', '9708 HD', TYPE_TABLET ),
 			'POLY PAD 9716HD'							=> array( 'Polypad', '9716 HD', TYPE_TABLET ),
-			'Polypad C508'								=> array( 'Polypad', 'C508', TYPE_TABLET ),
-			'POLYTRON W2430'							=> array( 'Polytron', 'W2430 Wizard Twins' ),
-			'POLYTRON W2500'							=> array( 'Polytron', 'W2500 Wizard Twins' ),
-			'POLYTRON W3430'							=> array( 'Polytron', 'W3430 Wizard Crystal' ),
 			'ACT2000'									=> array( 'Poptronix', 'ACT2000', TYPE_TABLET ),
-			'PMP3084B'									=> array( 'Prestigio', 'Multipad 3084', TYPE_TABLET ),
-			'PMP3170B'									=> array( 'Prestigio', 'Multipad 3170 Pro', TYPE_TABLET ),
-			'PMP3170BEN'								=> array( 'Prestigio', 'Multipad 3170 Pro', TYPE_TABLET ),
-			'PMP3270B'									=> array( 'Prestigio', 'Multipad 3270 Prime', TYPE_TABLET ),
-			'PMP3370B'									=> array( 'Prestigio', 'Multipad 3370', TYPE_TABLET ),
 			'PMP3384BRU'								=> array( 'Prestigio', 'Multipad 3384', TYPE_TABLET ),
-			'PMP3770B'									=> array( 'Prestigio', 'Multipad 3770', TYPE_TABLET ),
-			'PMP5080B'									=> array( 'Prestigio', 'Multipad 5080', TYPE_TABLET ),
 			'PMP5080CPRO'								=> array( 'Prestigio', 'Multipad 5080 Pro', TYPE_TABLET ),
-			'PMP5097CPRO'								=> array( 'Prestigio', 'Multipad 5097 Pro', TYPE_TABLET ),
-			'PMP5197DULTRA'								=> array( 'Prestigio', 'Multipad 5197 Ultra', TYPE_TABLET ),
-			'PMP5570C'									=> array( 'Prestigio', 'Multipad 5570 Pro', TYPE_TABLET ),	
-			'PMP5580C'									=> array( 'Prestigio', 'Multipad 5580 Prime', TYPE_TABLET ),
-			'PMP5597D'									=> array( 'Prestigio', 'Multipad 5597 Ultra Duo', TYPE_TABLET ),
-			'PMP5770D'									=> array( 'Prestigio', 'Multipad 5770 Pro', TYPE_TABLET ),
-			'PMP5880D'									=> array( 'Prestigio', 'Multipad 5880 Ultra Duo', TYPE_TABLET ),
-			'PMP7100D3G'								=> array( 'Prestigio', 'Multipad 7100 Ultimate 3G', TYPE_TABLET ),
-			'PAP3500 DUO'								=> array( 'Prestigio', 'Multiphone 3500 Duo' ),
-			'PAP4040 DUO'								=> array( 'Prestigio', 'Multiphone 4040 Duo' ),
-			'PAP4300 DUO'								=> array( 'Prestigio', 'Multiphone 4300 Duo' ),
-			'PAP4500DUO'								=> array( 'Prestigio', 'Multiphone 4500 Duo' ),
-			'PAP4500TDUO'								=> array( 'Prestigio', 'Multiphone 4500 Duo' ),
-			'PAP5000TDUO'								=> array( 'Prestigio', 'Multiphone 5000 Duo' ),
-			'MD-0696B'									=> array( 'Prolink', 'MD-0696B', TYPE_TABLET ),
 			'TB07FTA'									=> array( 'Positivo', 'TB07FTA', TYPE_TABLET ),
 			'QW TB-1207'								=> array( 'Qware', 'Pro3', TYPE_TABLET ),
 			'W6'										=> array( 'Ramos', 'W6', TYPE_TABLET ),
 			'W6HD ICS'									=> array( 'Ramos', 'W6HD', TYPE_TABLET ),
 			'W10'										=> array( 'Ramos', 'W10', TYPE_TABLET ),
 			'W10 V2.0'									=> array( 'Ramos', 'W10 v2.0', TYPE_TABLET ),
-			'Ramos W12HD'								=> array( 'Ramos', 'W12HD', TYPE_TABLET ),
 			'W17PRO(Dualcore)'							=> array( 'Ramos', 'W17 Pro Dual Core', TYPE_TABLET ),
 			'W22PRO'									=> array( 'Ramos', 'W22 Pro', TYPE_TABLET ),
-			'W22PRO 3G'									=> array( 'Ramos', 'W22 Pro 3G', TYPE_TABLET ),
-			'Ramos W27Pro'								=> array( 'Ramos', 'W27 Pro', TYPE_TABLET ),
 			'W28(Dualcore)'								=> array( 'Ramos', 'W28 Dual Core', TYPE_TABLET ),
-			'W30(QuadCore)'								=> array( 'Ramos', 'W30 Quad Core', TYPE_TABLET ),
-			'w30hd(QuadCore)'							=> array( 'Ramos', 'W30HD Quad Core', TYPE_TABLET ),
-			'w42(QuadCore)'								=> array( 'Ramos', 'W42 Quad Core', TYPE_TABLET ),
 			'T11AD!'									=> array( 'Ramos', 'T11AD', TYPE_TABLET ),
 			'Readboy G12'								=> array( 'Readboy', 'G12', TYPE_TABLET ),
+			'Rikomagic MK802'							=> array( 'Rikomagic', 'MK802', TYPE_TELEVISION ),
 			'PlayBook'									=> array( 'RIM', 'BlackBerry PlayBook', TYPE_TABLET ),
 			'RBK-490'									=> array( 'Ritmix', 'RBK-490', TYPE_TABLET ),
-			'RMD-755'									=> array( 'Ritmix', 'RBK-755', TYPE_TABLET ),
-			'RMD-1030'									=> array( 'Ritmix', 'RBK-1030', TYPE_TABLET ),
-			'RMD-73G'									=> array( 'Ross&Moor', 'RMD-73G', TYPE_TABLET ),	
-			'RMD-973G'									=> array( 'Ross&Moor', 'RMD-973G', TYPE_TABLET ),
-			'RoverPad 3W T71D'							=> array( 'RoverPad', '3W T71D', TYPE_TABLET ),
 			'A8HD'										=> array( 'Saayi', 'Dropad A8HD', TYPE_TABLET ),
 			'EK-GC100'									=> array( 'Samsung', 'Galaxy Camera', TYPE_CAMERA ),
-			'EK-GC110'									=> array( 'Samsung', 'Galaxy Camera', TYPE_CAMERA ),
 			'GT-B5330!'									=> array( 'Samsung', 'Galaxy Chat' ),
 			'GT-B5510!'									=> array( 'Samsung', 'Galaxy Y Pro' ),
 			'GT-B5512!'									=> array( 'Samsung', 'Galaxy Y Pro Duos' ),
 			'GT-B7510!'									=> array( 'Samsung', 'Galaxy Pro' ),
 			'GT-B9062'									=> array( 'Samsung', 'GT-B9062' ),
-			'GT-B9150'									=> array( 'Samsung', 'Galaxy "Q"' ),
 			'GT-I55(00|03|08)!'							=> array( 'Samsung', 'Galaxy 5' ),
 			'GT-I5510!'									=> array( 'Samsung', 'Galaxy 551' ),
 			'GT-I5700!'									=> array( 'Samsung', 'Galaxy Spica' ),
@@ -2161,34 +1573,24 @@ class DeviceModels {
 			'GT-I8150!'									=> array( 'Samsung', 'Galaxy W' ),
 			'GT-I8160!'									=> array( 'Samsung', 'Galaxy Ace 2' ),
 			'GT-I8190!'									=> array( 'Samsung', 'Galaxy S III Mini' ),
-			'GT-I8240!'									=> array( 'Samsung', 'GT-I8240' ),	
-			'GT-I8245!'									=> array( 'Samsung', 'GT-I8245' ),			
 			'GT-I8250!'									=> array( 'Samsung', 'GT-I8250' ),
-			'GT-I8262!'									=> array( 'Samsung', 'Galaxy Core' ),
 			'GT-I8320!'									=> array( 'Samsung', 'H1' ),
 			'GT-I85(20|30)!'							=> array( 'Samsung', 'Galaxy Beam' ),
-			'GT-I8730!'									=> array( 'Samsung', 'Galaxy Express' ),							
+			'GT-I8730!'									=> array( 'Samsung', 'Express' ),							
 			'GT-I90(00|08|18|88)!'						=> array( 'Samsung', 'Galaxy S' ),
 			'GT-I9001!'									=> array( 'Samsung', 'Galaxy S Plus' ),
 			'GT-I9003!'									=> array( 'Samsung', 'Galaxy SL' ),
 			'GT-I9010!'									=> array( 'Samsung', 'Galaxy S Giorgio Armani' ),
 			'GT-I9050!'									=> array( 'Samsung', 'GT-I9050' ),
 			'GT-I9070!'									=> array( 'Samsung', 'Galaxy S Advance' ),
-			'GT-I9082!'									=> array( 'Samsung', 'Galaxy Grand Duos' ),
 			'GT-I91(00|08)!'							=> array( 'Samsung', 'Galaxy S II' ),
 			'GT-I9103!'									=> array( 'Samsung', 'Galaxy R' ),
-			'GT-I9105!'									=> array( 'Samsung', 'Galaxy S II Plus' ),
-			'GT-I9150!'									=> array( 'Samsung', 'Galaxy "Fonblet 5.8"' ),
-			'GT-I9152!'									=> array( 'Samsung', 'Galaxy "Fonblet 5.8" Duos' ),
-			'GT-I9190!'									=> array( 'Samsung', 'Galaxy S4 Mini' ),
-			'GT-I9200!'									=> array( 'Samsung', 'Galaxy S II' ),
-			'GT-I9205'									=> array( 'Samsung', 'Galaxy "Fonblet 6.3"' ),
 			'GT-I9210!'									=> array( 'Samsung', 'Galaxy S II LTE' ),
 			'GT-I92(20|28)!'							=> array( 'Samsung', 'Galaxy Note' ),
 			'GT-I9250!'									=> array( 'Samsung', 'Galaxy Nexus' ),
-			'GT-I92(60|68)!'							=> array( 'Samsung', 'Galaxy Premier' ),
+			'GT-I9260'									=> array( 'Samsung', 'Galaxy Premier' ),
 			'GT-I93(00|03|05|08)!'						=> array( 'Samsung', 'Galaxy S III' ),
-			'GT-I95(00|05)!'							=> array( 'Samsung', 'Galaxy S4' ),
+			'GT-I95(00|05)!'							=> array( 'Samsung', 'Galaxy S IV' ),
 			'GT-I9800!'									=> array( 'Samsung', 'GT-I9800' ),
 			'GT-N5100'									=> array( 'Samsung', 'Galaxy Note 8.0', TYPE_TABLET ),
 			'GT-N70(00|05)!'							=> array( 'Samsung', 'Galaxy Note' ),
@@ -2208,11 +1610,8 @@ class DeviceModels {
 			'GT-P75(01|11)!'							=> array( 'Samsung', 'Galaxy Tab 10.1N', TYPE_TABLET ),
 			'GT-P8110!'									=> array( 'Samsung', 'Nexus 10', TYPE_TABLET ),
 			'GT-P8200!'									=> array( 'Samsung', 'Galaxy Tab "Roma"', TYPE_TABLET ),
-			'GT-S5282!'									=> array( 'Samsung', 'Galaxy Star' ),
 			'GT-S5300!'									=> array( 'Samsung', 'Galaxy Pocket' ),
 			'GT-S5302!'									=> array( 'Samsung', 'Galaxy Pocket Duos' ),
-			'GT-S5310!'									=> array( 'Samsung', 'Galaxy Pocket 2' ),
-			'GT-S5312!'									=> array( 'Samsung', 'Galaxy Pocket 2 Duos' ),
 			'GT-S53(60|63|69)!'							=> array( 'Samsung', 'Galaxy Y' ),
 			'GT-S5367!'									=> array( 'Samsung', 'Galaxy Y TV' ),
 			'GT-S5368!'									=> array( 'Samsung', 'GT-S5368' ),
@@ -2224,22 +1623,15 @@ class DeviceModels {
 			'GT-S6010'									=> array( 'Samsung', 'Galaxy Music' ),
 			'GT-S6012!'									=> array( 'Samsung', 'Galaxy Music Duos' ),
 			'GT-S6102!'									=> array( 'Samsung', 'Galaxy Y Duos' ),
-			'GT-S6310!'									=> array( 'Samsung', 'Galaxy Young' ),
-			'GT-S6312!'									=> array( 'Samsung', 'Galaxy Young Duos' ),
-			'GT-S6352!'									=> array( 'Samsung', 'Galaxy Ace Duos' ),
-			'GT-S6358!'									=> array( 'Samsung', 'Galaxy Ace' ),
+			'GT-S6352'									=> array( 'Samsung', 'Galaxy Ace Duos' ),
+			'GT-S6358'									=> array( 'Samsung', 'Galaxy Ace' ),
 			'GT-S6500!'									=> array( 'Samsung', 'Galaxy Mini 2' ),
 			'GT-S6702!'									=> array( 'Samsung', 'Galaxy Y Duos' ),
 			'GT-S6802!'									=> array( 'Samsung', 'Galaxy Ace Duos' ),
-			'GT-S6810!'									=> array( 'Samsung', 'Galaxy Frame' ),
-			'GT-S75(00|08)!'							=> array( 'Samsung', 'Galaxy Ace Plus' ),
+			'GT-S7500!'									=> array( 'Samsung', 'Galaxy Ace Plus' ),
 			'GT-S7560!'									=> array( 'Samsung', 'Galaxy Ace II x' ),
-			'GT-S75(62|68)!'							=> array( 'Samsung', 'Galaxy S Duos' ),
-			'GT-S7572!'									=> array( 'Samsung', 'GT-S7572' ),
+			'GT-S7562!'									=> array( 'Samsung', 'Galaxy S Duos' ),
 			'GT-S7710!'									=> array( 'Samsung', 'Galaxy Xcover 2' ),
-			'GT-S8500'									=> array( 'Samsung', 'Wave' ),
-			'GT-S8530'									=> array( 'Samsung', 'Wave II' ),
-			'GT-S9081'									=> array( 'Samsung', 'GT-S9081' ),
 			'GT-T959!'									=> array( 'Samsung', 'Galaxy S Vibrant' ),
 			'SCH-i509'									=> array( 'Samsung', 'Galaxy Y' ),
 			'SCH-i559'									=> array( 'Samsung', 'Galaxy Pop' ),
@@ -2259,7 +1651,6 @@ class DeviceModels {
 			'SCH-I400'									=> array( 'Samsung', 'Continuum' ),
 			'SCH-I405( 4G)?$!'							=> array( 'Samsung', 'Stratosphere' ),
 			'SCH-I405U'									=> array( 'Samsung', 'Galaxy Metrix' ),
-			'SCH-I415( 4G)?$!'							=> array( 'Samsung', 'Stratosphere II' ),
 			'SCH-I500'									=> array( 'Samsung', 'Fascinate' ),
 			'SCH-I510'									=> array( 'Samsung', 'Stealth V' ),
 			'SCH-I510 4G'								=> array( 'Samsung', 'Droid Charge' ),
@@ -2269,19 +1660,14 @@ class DeviceModels {
 			'SCH-I619'									=> array( 'Samsung', 'SCH-I619' ),
 			'SCH-I659'									=> array( 'Samsung', 'Galaxy Ace Plus' ),
 			'SCH-I699'									=> array( 'Samsung', 'Galaxy Trend' ),
-			'SCH-I739'									=> array( 'Samsung', 'SCH-I739' ),
 			'SCH-I779'									=> array( 'Samsung', 'SCH-I779' ),
 			'SCH-I800'									=> array( 'Samsung', 'Galaxy Tab 7.0', TYPE_TABLET ),
 			'SCH-I815!'									=> array( 'Samsung', 'Galaxy Tab 7.7', TYPE_TABLET ),
-			'SCH-I829'									=> array( 'Samsung', 'SCH-I829' ),
-			'SCH-I879'									=> array( 'Samsung', 'Captivate' ),
 			'SCH-I905!'									=> array( 'Samsung', 'Galaxy Tab 10.1', TYPE_TABLET ),
 			'SCH-I909'									=> array( 'Samsung', 'Galaxy S' ),
 			'SCH-I915!'									=> array( 'Samsung', 'Galaxy Tab 2 (10.1)', TYPE_TABLET ),
-			'SCH-I919!'									=> array( 'Samsung', 'SCH-I919' ),
 			'SCH-I925!'									=> array( 'Samsung', 'Galaxy Note 10.1', TYPE_TABLET ),
-			'SCH-I939!'									=> array( 'Samsung', 'Galaxy S III' ),
-			'SCH-I959'									=> array( 'Samsung', 'Galaxy S4' ),
+			'SCH-I939'									=> array( 'Samsung', 'Galaxy S III' ),
 			'SCH-L710'									=> array( 'Samsung', 'Galaxy S III' ),
 			'SCH-M828!'									=> array( 'Samsung', 'Galaxy Precedent' ),
 			'SCH-N719'									=> array( 'Samsung', 'Galaxy Note II' ),
@@ -2290,10 +1676,8 @@ class DeviceModels {
 			'SCH-R680'									=> array( 'Samsung', 'Repp' ),
 			'SCH-R720'									=> array( 'Samsung', 'Admire' ),
 			'SCH-R730'									=> array( 'Samsung', 'Transfix' ),
-			'SCH-R740!'									=> array( 'Samsung', 'SCH-R740' ),
 			'SCH-R760'									=> array( 'Samsung', 'Galaxy S II' ),
 			'SCH-R820'									=> array( 'Samsung', 'Admire' ),
-			'SCH-R830!'									=> array( 'Samsung', 'Axiom' ),
 			'SCH-R880'									=> array( 'Samsung', 'Acclaim' ),
 			'SCH-R910'									=> array( 'Samsung', 'Galaxy Indulge 4G' ),
 			'SCH-R915'									=> array( 'Samsung', 'Galaxy Indulge' ),
@@ -2301,29 +1685,23 @@ class DeviceModels {
 			'SCH-R930'									=> array( 'Samsung', 'Galaxy S Aviator' ),
 			'SCH-R940'									=> array( 'Samsung', 'Galaxy S Lightray' ),
 			'SCH-R950'									=> array( 'Samsung', 'Galaxy Note II' ),
-			'SCH-R970C'									=> array( 'Samsung', 'SCH-R970C' ),
 			'SCH-S720C'									=> array( 'Samsung', 'Galaxy Proclaim' ),
 			'SCH-S735C'									=> array( 'Samsung', 'SCH-S735' ),
 			'SCH-S950C'									=> array( 'Samsung', 'Galaxy S Showcase' ),
-			'SCH-V727'									=> array( 'Samsung', 'Galaxy S4' ),
 			'SCH-W799!'									=> array( 'Samsung', 'SCH-W799' ),
 			'SCH-W899'									=> array( 'Samsung', 'SCH-W899' ),
 			'SCH-W999'									=> array( 'Samsung', 'SCH-W999' ),
-			'SCH-W2013'									=> array( 'Samsung', 'SCH-W2013' ),
 			'SGH-E258'									=> array( 'Samsung', 'SGH-E258' ),
 			'SGH-I317!'									=> array( 'Samsung', 'Galaxy Note II' ),
-			'SGH-I337!'									=> array( 'Samsung', 'Galaxy S4' ),
-			'SGH-I437!'									=> array( 'Samsung', 'Galaxy Express' ),
+			'SGH-I337!'									=> array( 'Samsung', 'Galaxy S IV' ),
 			'SGH-I497'									=> array( 'Samsung', 'Galaxy Tab 2 (10.1)', TYPE_TABLET ),
 			'SGH-I547!'									=> array( 'Samsung', 'Galaxy Rugby Pro' ),
-			'SGH-I577!'									=> array( 'Samsung', 'Galaxy Exhilarate' ),	
 			'SGH-I717!'									=> array( 'Samsung', 'Galaxy Note' ),
 			'SGH-I727'									=> array( 'Samsung', 'Galaxy S II Skyrocket' ),
 			'SGH-I727R'									=> array( 'Samsung', 'Galaxy S II' ),
 			'SGH-I7(47|48)!'							=> array( 'Samsung', 'Galaxy S III' ),
 			'SGH-I757!'									=> array( 'Samsung', 'Galaxy S II Skyrocket HD' ),
 			'SGH-I9?777!'								=> array( 'Samsung', 'Galaxy S II' ),
-			'SGH-I827D'									=> array( 'Samsung', 'Galaxy Ace Q' ),
 			'SGH-I847'									=> array( 'Samsung', 'Rugby Smart' ),
 			'SGH-I8(96|97)!'							=> array( 'Samsung', 'Captivate' ),
 			'SGH-I927!'									=> array( 'Samsung', 'Captivate Glide' ),
@@ -2338,7 +1716,6 @@ class DeviceModels {
 			'SGH-T499'									=> array( 'Samsung', 'Dart' ),
 			'SGH-T499[VY]!'								=> array( 'Samsung', 'Galaxy Mini' ),
 			'SGH-T589!'									=> array( 'Samsung', 'Gravity Smart' ),
-			'SGH-T599!'									=> array( 'Samsung', 'Exhibit' ),	
 			'SGH-T679!'									=> array( 'Samsung', 'Exhibit II 4G' ),
 			'SGH-T699'									=> array( 'Samsung', 'S Blaze Q' ),
 			'SGH-T759'									=> array( 'Samsung', 'Exhibit 4G' ),
@@ -2354,7 +1731,6 @@ class DeviceModels {
 			'SGH-T959D'									=> array( 'Samsung', 'Galaxy S Fascinate 3G+' ),
 			'SGH-T959P'									=> array( 'Samsung', 'Galaxy S Fascinate 4G' ),
 			'SGH-T959V'									=> array( 'Samsung', 'Galaxy S 4G' ),
-			'SGH-T959W'									=> array( 'Samsung', 'Galaxy S 4G' ),
 			'SGH-T989'									=> array( 'Samsung', 'Galaxy S II' ),
 			'SGH-T989D'									=> array( 'Samsung', 'Galaxy S II X' ),
 			'SGH-T999!'									=> array( 'Samsung', 'Galaxy S Blaze 4G' ),
@@ -2365,11 +1741,9 @@ class DeviceModels {
 			'SHV-E160!'									=> array( 'Samsung', 'Galaxy Note' ),
 			'SHV-E170!'									=> array( 'Samsung', 'Galaxy R' ),
 			'SHV-E210!'									=> array( 'Samsung', 'Galaxy S III' ),
-			'SHV-E220!'									=> array( 'Samsung', 'Galaxy Pop' ),
-			'SHV-E230!'									=> array( 'Samsung', 'Galaxy Note 10.1' ),
 			'SHV-E250!'									=> array( 'Samsung', 'Galaxy Note II' ),
 			'SHV-E270!'									=> array( 'Samsung', 'Galaxy Grand' ),
-			'SHV-E300!'									=> array( 'Samsung', 'Galaxy S4' ),
+			'SHV-E300!'									=> array( 'Samsung', 'Galaxy S IV' ),
 			'SHW-M100!'									=> array( 'Samsung', 'Galaxy A' ),
 			'SHW-M110!'									=> array( 'Samsung', 'Galaxy S' ),
 			'SHW-M130L!'								=> array( 'Samsung', 'Galaxy U' ),
@@ -2385,7 +1759,7 @@ class DeviceModels {
 			'SHW-M340!'									=> array( 'Samsung', 'Galaxy M Style' ),
 			'SHW-M380!'									=> array( 'Samsung', 'Galaxy Tab 10.1', TYPE_TABLET ),
 			'SHW-M440!'									=> array( 'Samsung', 'Galaxy S III' ),
-			'SHW-M4(80|85)!'							=> array( 'Samsung', 'Galaxy Note 10.1' ),
+			'SHW-M480!'									=> array( 'Samsung', 'Galaxy Note 10.1' ),
 			'SMT-i9100'									=> array( 'Samsung', 'SMT-I9100', TYPE_TABLET ),
 			'SPH-D600'									=> array( 'Samsung', 'Conquer 4G' ),
 			'SPH-D700'									=> array( 'Samsung', 'Epic 4G' ),
@@ -2397,18 +1771,16 @@ class DeviceModels {
 			'SPH-L900'									=> array( 'Samsung', 'Galaxy Note II' ),
 			'SPH-M820!'									=> array( 'Samsung', 'Galaxy Prevail' ),
 			'SPH-M830'									=> array( 'Samsung', 'Galaxy Rush' ),
-			'SPH-M580!'									=> array( 'Samsung', 'Replenish' ),
+			'SPH-M580'									=> array( 'Samsung', 'Replenish' ),
 			'SPH-M900'									=> array( 'Samsung', 'Moment' ),
 			'SPH-M910'									=> array( 'Samsung', 'Intercept' ),
 			'SPH-M920'									=> array( 'Samsung', 'Transform' ),
 			'SPH-M930!'									=> array( 'Samsung', 'Transform Ultra' ),
 			'SPH-M950'									=> array( 'Samsung', 'Galaxy Reverb' ),
 			'SPH-P100'									=> array( 'Samsung', 'Galaxy Tab', TYPE_TABLET ),
-			'SPH-P500'									=> array( 'Samsung', 'Galaxy Tab 2 10.1', TYPE_TABLET ),
 			'YP-GB1'									=> array( 'Samsung', 'Galaxy Player', 'media' ),
 			'YP-GB70'									=> array( 'Samsung', 'Galaxy Player 70', 'media' ),
 			'YP-GB70D'									=> array( 'Samsung', 'Galaxy Player 70 Plus', 'media' ),
-			'YP-GP1'									=> array( 'Samsung', 'Galaxy Player 5.8', 'media' ),
 			'YP-GS1'									=> array( 'Samsung', 'Galaxy S WiFi 3.6', 'media' ),
 			'YP-G1'										=> array( 'Samsung', 'Galaxy S WiFi 4.0', 'media' ),
 			'YP-GI1'									=> array( 'Samsung', 'Galaxy S WiFi 4.2', 'media' ),
@@ -2421,18 +1793,11 @@ class DeviceModels {
 			'T959'										=> array( 'Samsung', 'Galaxy S Vibrant' ),
 			'Captivate-I897'							=> array( 'Samsung', 'Captivate' ),
 			'Galaxy'									=> array( 'Samsung', 'Galaxy' ),
-			'Galaxy ACE'								=> array( 'Samsung', 'Galaxy Ace' ),
-			'Galaxy Mini'								=> array( 'Samsung', 'Galaxy Mini' ),
-			'Galaxy Mini Plus 4G'						=> array( 'Samsung', 'Galaxy Mini Plus' ),
 			'Galaxy Note'								=> array( 'Samsung', 'Galaxy Note' ),
-			'Galaxy Note II'							=> array( 'Samsung', 'Galaxy Note II' ),
 			'GalaxyS'									=> array( 'Samsung', 'Galaxy S' ),
 			'Galaxy S II'								=> array( 'Samsung', 'Galaxy S II' ),
-			'Galaxy S III'								=> array( 'Samsung', 'Galaxy S III' ),
 			'Galaxy X'									=> array( 'Samsung', 'Galaxy X' ),
 			'Galaxy Spica'								=> array( 'Samsung', 'Galaxy Spica' ),
-			'Galaxy pop plus 4G'						=> array( 'Samsung', 'Galaxy Pop Plus' ),
-			'Galaxy Precedent'							=> array( 'Samsung', 'Galaxy Precedent' ),
 			'GALAXY Tab'								=> array( 'Samsung', 'Galaxy Tab', TYPE_TABLET ),
 			'Vibrantmtd'								=> array( 'Samsung', 'Vibrant' ),
 			'Vibrant T959'								=> array( 'Samsung', 'Vibrant' ),
@@ -2448,9 +1813,7 @@ class DeviceModels {
 			'SC-04D'									=> array( 'Samsung', 'Galaxy Nexus' ),
 			'SC-05D'									=> array( 'Samsung', 'Galaxy Note LTE' ),
 			'SC-06D'									=> array( 'Samsung', 'Galaxy S III' ),
-			'SCL21'										=> array( 'Samsung', 'Galaxy S III Progre' ),
 			'ISW11SC'									=> array( 'Samsung', 'Galaxy S II WiMAX' ),
-			'Bambook S1'								=> array( 'Shanda', 'Bambook S1', TYPE_TABLET ),
 			'A01SH'										=> array( 'Sharp', 'A01SH' ),
 			'IS01'										=> array( 'Sharp', 'IS01' ),
 			'IS03'										=> array( 'Sharp', 'IS03' ),
@@ -2460,7 +1823,6 @@ class DeviceModels {
 			'IS13SH'									=> array( 'Sharp', 'Aquos IS13SH' ),
 			'IS14SH'									=> array( 'Sharp', 'Aquos IS14SH' ),
 			'ISW16SH'									=> array( 'Sharp', 'Aquos ISW16SH' ),
-			'IS17SH'									=> array( 'Sharp', 'Aquos CL IS17SH' ),
 			'EB-W51GJ'									=> array( 'Sharp', 'EB-W51GJ' ),
 			'SBM003SH'									=> array( 'Sharp', 'Galapagos' ),
 			'SBM005SH'									=> array( 'Sharp', 'Galapagos' ),
@@ -2475,7 +1837,6 @@ class DeviceModels {
 			'SBM107SH'									=> array( 'Sharp', 'Aquos 107SH' ),
 			'SBM107SHB'									=> array( 'Sharp', 'Aquos 107SH' ),
 			'SBM200SH'									=> array( 'Sharp', 'PANTONE 6 200SH' ),
-			'SBM203SH'									=> array( 'Sharp', 'Aquos Xx 203SH' ),
 			'SH-01D'									=> array( 'Sharp', 'Aquos SH-01D' ),
 			'SH-01E'									=> array( 'Sharp', 'Aquos si SH-01E' ),
 			'SH-02D'									=> array( 'Sharp', 'Aquos slider SH-02D' ),
@@ -2493,50 +1854,34 @@ class DeviceModels {
 			'SH80F'										=> array( 'Sharp', 'Aquos SH80F' ),
 			'SH530U'									=> array( 'Sharp', 'SH530U' ),
 			'SH-631M'									=> array( 'Sharp', 'SH631M' ),
-			'SH631W'									=> array( 'Sharp', 'SH631W' ),
-			'SH837W'									=> array( 'Sharp', 'SH837W' ),
-			'SH930W'									=> array( 'Sharp', 'SH930W' ),
 			'SH72x8U'									=> array( 'Sharp', 'SH72x8U' ),
 			'SH8118U'									=> array( 'Sharp', 'SH8118U' ),
 			'SH8128U'									=> array( 'Sharp', 'SH8128U' ),
 			'SH8158U'									=> array( 'Sharp', 'SH8158U' ),
-			'SH8168U'									=> array( 'Sharp', 'SH8168U' ),
 			'SH8188U'									=> array( 'Sharp', 'SH8188U' ),
 			'SH8268U'									=> array( 'Sharp', 'SH8268U' ),
-			'SHL21'										=> array( 'Sharp', 'Aquos Serie SHL21' ),
-			'SHT21'										=> array( 'Sharp', 'Aquos Pad SHT21', TYPE_TABLET ),
 			'INFOBAR C01'								=> array( 'Sharp', 'INFOBAR C01' ),
 			'SPX-5'										=> array( 'Simvalley', 'SPX-5' ),
 			'SPX-5 3G'									=> array( 'Simvalley', 'SPX-5 3G' ),
-			'SPX-12'									=> array( 'Simvalley', 'SPX-12' ),
-			'Skyworth PE90'								=> array( 'Skyworth', 'PE90' ),
-			'Andromax U'								=> array( 'Smartfren', 'Andromax U' ),
-			'Smartfren Tab 7'							=> array( 'Smartfren', 'Tab 7' ),
 			'SmartQ G7'									=> array( 'SmartQ', 'G7', TYPE_TABLET ),
 			'SmartQT7'									=> array( 'SmartQ', 'T7', TYPE_TABLET ),
 			'SmartQT10'									=> array( 'SmartQ', 'T10', TYPE_TABLET ),
 			'SmartQT15'									=> array( 'SmartQ', 'T15', TYPE_TABLET ),
 			'SmartQT19'									=> array( 'SmartQ', 'T19', TYPE_TABLET ),
 			'SmartQT20'									=> array( 'SmartQ', 'T20', TYPE_TABLET ),
-			'T20'										=> array( 'SmartQ', 'T20', TYPE_TABLET ),
-			'T30'										=> array( 'SmartQ', 'T30', TYPE_TABLET ),
 			'OMS1 6'									=> array( 'Sony Ericsson', 'A8i' ),
 			'C15(04|05)!'								=> array( 'Sony', 'Xperia E' ),
 			'C16(04|05)!'								=> array( 'Sony', 'Xperia E dual' ),
-			'C21(04|05)!'								=> array( 'Sony', 'Xperia L' ),
+			'C21(04|05)!'								=> array( 'Sony', 'Xperia "Gaga"' ),
 			'C3602'										=> array( 'Sony', 'Xperia "Togari"' ),
-			'C53(02|03|06)!'							=> array( 'Sony', 'Xperia SP' ),
+			'C430[0-9]!'								=> array( 'Sony', 'C430X' ),
+			'C5303'										=> array( 'Sony', 'Xperia "HuaShan"' ),
 			'C550[0-9]!'								=> array( 'Sony', 'Xperia "Dogo"' ),
 			'C65(02|03|06)!'							=> array( 'Sony', 'Xperia ZL' ),
-			'C66(02|03|06)!'							=> array( 'Sony', 'Xperia Z' ),
-			'C670[0-9]!'								=> array( 'Sony', 'Xperia "Honami"' ),
-//			'C6750'										
-			'C6802'										=> array( 'Sony', 'Xperia "Gaga"' ),
-			'C69(02|07)!'								=> array( 'Sony', 'Xperia Tablet Z', TYPE_TABLET ),
+			'C6603'										=> array( 'Sony', 'Xperia Z' ),
 			'E10(a|i|iv)!'								=> array( 'Sony Ericsson', 'Xperia X10 Mini' ),
 			'E15(a|i|iv|i-o)?$!'						=> array( 'Sony Ericsson', 'Xperia X8' ),
 			'E16i!'										=> array( 'Sony Ericsson', 'W8 Walkman' ),
-			'L36h'										=> array( 'Sony', 'Xperia Z' ),
 			'LT11i!'									=> array( 'Sony Ericsson', 'Xperia Neo V' ),
 			'LT15(a|i|iv|i-o)?$!'						=> array( 'Sony Ericsson', 'Xperia Arc' ),
 			'LT15i Speed Edition'						=> array( 'Sony Ericsson', 'Xperia Arc' ),
@@ -2561,7 +1906,7 @@ class DeviceModels {
 			'ST15(a|i)!'								=> array( 'Sony Ericsson', 'Xperia Mini' ),
 			'ST17(a|i)!'								=> array( 'Sony Ericsson', 'Xperia Active' ),
 			'ST18(a|av|i|iv)!'							=> array( 'Sony Ericsson', 'Xperia Ray' ),
-			'ST21(a|i|i-o|iv)?$!'						=> array( 'Sony', 'Xperia Tipo' ),
+			'ST21(a|i)?$!'								=> array( 'Sony', 'Xperia Tipo' ),
 			'ST21(a2|i2)!'								=> array( 'Sony', 'Xperia Tipo Dual' ),
 			'ST23(a|i)!'								=> array( 'Sony', 'Xperia Miro' ),
 			'ST25(a|i)!'								=> array( 'Sony', 'Xperia U' ),
@@ -2572,7 +1917,7 @@ class DeviceModels {
 			'WT18i!'									=> array( 'Sony Ericsson', 'Walkman' ),
 			'WT19(a|i|iv)!'								=> array( 'Sony Ericsson', 'Live with Walkman' ),
 			'X8'										=> array( 'Sony Ericsson', 'Xperia X8' ),
-			'X10(a|i|iv|i-o|s)?$!'						=> array( 'Sony Ericsson', 'Xperia X10' ),
+			'X10(a|i|iv|s)?$!'							=> array( 'Sony Ericsson', 'Xperia X10' ),
 			'X10 ?(Mini|Mini Pro)$!'					=> array( 'Sony Ericsson', 'Xperia X10 Mini Pro' ),
 			'Z1i'										=> array( 'Sony Ericsson', 'Xperia Play' ),
 			'S51SE'										=> array( 'Sony Ericsson', 'Xperia Mini' ),
@@ -2587,120 +1932,80 @@ class DeviceModels {
 			'SO-02E'									=> array( 'Sony', 'Xperia Z' ),
 			'SO-03C'									=> array( 'Sony Ericsson', 'Xperia Ray' ),
 			'SO-03D'									=> array( 'Sony Ericsson', 'Xperia Acro HD' ),
-			'SO-03E'									=> array( 'Sony', 'Xperia Tablet Z', TYPE_TABLET ),
+			'SO-03E'									=> array( 'Sony', 'Xperia "Honami"' ),
 			'SO-04D'									=> array( 'Sony', 'Xperia GX' ),
-			'SO-04E'									=> array( 'Sony', 'Xperia "Dogo"' ),
 			'SO-05D'									=> array( 'Sony', 'Xperia SX' ),
 			'SOL21'										=> array( 'Sony', 'Xperia VL' ),
 			'Xperia X1'									=> array( 'Sony Ericsson', 'Xperia X1' ),
 			'Xperia X8'									=> array( 'Sony Ericsson', 'Xperia X8' ),
 			'Xperia X10'								=> array( 'Sony Ericsson', 'Xperia X10' ),
+			'Xperia Ray'								=> array( 'Sony Ericsson', 'Xperia Ray' ),
 			'Xperia Acro S'								=> array( 'Sony', 'Xperia Acro S' ),
-			'Xperia Active'								=> array( 'Sony Ericsson', 'Xperia Active' ),
 			'Xperia Arc'								=> array( 'Sony Ericsson', 'Xperia Arc' ),
 			'Xperia Arc S'								=> array( 'Sony Ericsson', 'Xperia Arc S' ),
-			'Xperia Go'									=> array( 'Sony', 'Xperia Go' ),
 			'Xperia ion'								=> array( 'Sony', 'Xperia Ion' ),
-			'Xperia J'									=> array( 'Sony', 'Xperia J' ),
-			'Xperia Miro'								=> array( 'Sony', 'Xperia Miro' ),
 			'Xperia Mini'								=> array( 'Sony Ericsson', 'Xperia Mini' ),
 			'Xperia Mini Pro'							=> array( 'Sony Ericsson', 'Xperia Mini Pro' ),
 			'Xperia Neo'								=> array( 'Sony Ericsson', 'Xperia Neo' ),
 			'Xperia NeoV'								=> array( 'Sony Ericsson', 'Xperia Neo V' ),
 			'Xperia Neo V'								=> array( 'Sony Ericsson', 'Xperia Neo V' ),
-			'Xperia Neo L'								=> array( 'Sony', 'Xperia Neo L' ),
-			'Xperia P'									=> array( 'Sony', 'Xperia P' ),
 			'Xperia Play'								=> array( 'Sony Ericsson', 'Xperia Play' ),
 			'Xperia Pro'								=> array( 'Sony Ericsson', 'Xperia Pro' ),
-			'Xperia Ray'								=> array( 'Sony Ericsson', 'Xperia Ray' ),
 			'Xperia S'									=> array( 'Sony', 'Xperia S' ),
-			'Xperia SL'									=> array( 'Sony', 'Xperia SL' ),
 			'Xperia Sola'								=> array( 'Sony', 'Xperia Sola' ),
-			'Xperia T'									=> array( 'Sony', 'Xperia T' ),
 			'Xperia Tipo'								=> array( 'Sony', 'Xperia Tipo' ),
-			'Xperia U'									=> array( 'Sony', 'Xperia U' ),
-			'Xperia Z'									=> array( 'Sony', 'Xperia Z' ),
 			'Xperia Live with Walkman'					=> array( 'Sony Ericsson', 'Live with Walkman' ),
 			'Live ?With ?Walkman!'						=> array( 'Sony Ericsson', 'Live with Walkman' ),
-			'Neo V'										=> array( 'Sony Ericsson', 'Xperia Neo V' ),
 			'Hayabusa'									=> array( 'Sony', 'Xperia Ion' ),
 			'Nozomi'									=> array( 'Sony', 'Xperia S' ),
 			'Tablet P'									=> array( 'Sony', 'Tablet P', TYPE_TABLET ),
 			'Tablet S'									=> array( 'Sony', 'Tablet S', TYPE_TABLET ),
-			'SGPT12'									=> array( 'Sony', 'Xperia Tablet S', TYPE_TABLET ),
-			'SGPT13'									=> array( 'Sony', 'Xperia Tablet S', TYPE_TABLET ),
-			'SGP311'									=> array( 'Sony', 'Xperia Tablet Z', TYPE_TABLET ),
-			'SGP321'									=> array( 'Sony', 'Xperia Tablet Z', TYPE_TABLET ),
+			'SGPT12'									=> array( 'Sony', 'Tablet S', TYPE_TABLET ),
 			'NWZ?-Z1000Series!'							=> array( 'Sony', 'Walkman Z', TYPE_MEDIA ),
 			'NSZ-GP9'									=> array( 'Sony', 'NSZ-GP9', TYPE_TELEVISION, FLAG_GOOGLETV ),
 			'NSZ-GS7'									=> array( 'Sony', 'NSZ-GS7', TYPE_TELEVISION, FLAG_GOOGLETV ),
 			'NSZ-GT1'									=> array( 'Sony', 'NSZ-GT1', TYPE_TELEVISION, FLAG_GOOGLETV ),
 			'Spice Mi280'								=> array( 'Spice', 'Mi-280' ),
-			'SPICE Mi-285'								=> array( 'Spice', 'Mi-285' ),
 			'Spice Mi300'								=> array( 'Spice', 'Mi-300' ),
-			'CSL Spice MI300'							=> array( 'Spice', 'Mi-300' ),
 			'Spice Mi-310'								=> array( 'Spice', 'Mi-310' ),
-			'Mi320'										=> array( 'Spice', 'Mi-320' ),
-			'Spice Mi-350'								=> array( 'Spice', 'Mi-350' ),
 			'Spice Mi-355'								=> array( 'Spice', 'Mi-355' ),
-			'CSL-MI410'									=> array( 'Spice', 'Mi-410' ),
 			'Spice Mi-425'								=> array( 'Spice', 'Mi-425' ),
-			'Spice Mi-435'								=> array( 'Spice', 'Mi-435' ),
-			'Spice Mi-495'								=> array( 'Spice', 'Mi-495' ),
 			'Spice Mi-500'								=> array( 'Spice', 'Mi-500' ),
 			'SPICE Mi-720'								=> array( 'Spice', 'Mi-720' ),
-			'SpiceMi1010'								=> array( 'Spice', 'Mi-1010 Stellar Pad', TYPE_TABLET ),
-			'A5000'										=> array( 'Star', 'A5000' ),
 			'A7272+'									=> array( 'Star', 'A7272+' ),
-			'N710'										=> array( 'Star', 'N710' ),
-			'e1808 v75!'								=> array( 'Star', 'N8000' ),
-			'V1277'										=> array( 'Star', 'V1277' ),
-			'e1109 v73!'								=> array( 'Star', 'X18i' ),
+			'e1109 v73 gq1002 ctp'						=> array( 'Star', 'X18i' ),
 			'Cyclone Voyager'							=> array( 'Sumvision', 'Cyclone Voyager', TYPE_TABLET ),
 			'M1001'										=> array( 'Superpad', 'M1001', TYPE_TABLET ),
 			'TS1004T'									=> array( 'Surf 3Q', 'TS1004T', TYPE_TABLET ),
 			'SYTABEX7-2'								=> array( 'Sylvania', 'SYTABEX7', TYPE_TABLET ),
-			'Synrgic Uno M1'							=> array( 'Synrgic', 'Uno M1' ),
 			'KM-S200'									=> array( 'TAKE', 'Janus KM-S200' ),
-			'TCL A506'									=> array( 'TCL', 'A506' ),
 			'TCL A860'									=> array( 'TCL', 'A860' ),
 			'TCL A906'									=> array( 'TCL', 'A906' ),
 			'TCL A909'									=> array( 'TCL', 'A909' ),
 			'TCL A919'									=> array( 'TCL', 'A919' ),
 			'TCL A966'									=> array( 'TCL', 'A966' ),
 			'TCL A968'									=> array( 'TCL', 'A968' ),
-			'TCL A988'									=> array( 'TCL', 'A988' ),
 			'TCL A990'									=> array( 'TCL', 'A990' ),
 			'TCL A996'									=> array( 'TCL', 'A996' ),
 			'TCL A998'									=> array( 'TCL', 'A998' ),
 			'TCL C990+'									=> array( 'TCL', 'C990+' ),
-			'TCL-D668'									=> array( 'TCL', 'D668' ),
 			'TCL GENESEE E708'							=> array( 'TCL', 'Genesee E708' ),
 			'TCL S500'									=> array( 'TCL', 'S500' ),
 			'(TCL )?S600!'								=> array( 'TCL', 'S600' ),
-			'TCL S800'									=> array( 'TCL', 'S800' ),
-			'TCL S820'									=> array( 'TCL', 'S820' ),
 			'TCL S830'									=> array( 'TCL', 'S830' ),
 			'TCL S900'									=> array( 'TCL', 'S900' ),
 			'TCL W939'									=> array( 'TCL', 'W939' ),
-			'TCL W969'									=> array( 'TCL', 'W969' ),
 			'TCL Y710'									=> array( 'TCL', 'Y710' ),
 			'A10t(5DM3)'								=> array( 'Teclast', 'A10T', TYPE_TABLET ),
 			'P72'										=> array( 'Teclast', 'P72', TYPE_TABLET ),
-			'P75HD(M3E5)'								=> array( 'Teclast', 'P75HD', TYPE_TABLET ),
-			'Teclast P76e!'								=> array( 'Teclast', 'P76e', TYPE_TABLET ),
 			'P76TI'										=> array( 'Teclast', 'P76Ti', TYPE_TABLET ),
 			'P81HD'										=> array( 'Teclast', 'P81HD', TYPE_TABLET ),
-			'P85(A9D3)'									=> array( 'Teclast', 'P85', TYPE_TABLET ),
 			'P85(R8A1)'									=> array( 'Teclast', 'P85', TYPE_TABLET ),
-			'Teclast P85!'								=> array( 'Teclast', 'P85', TYPE_TABLET ),
+			'Teclast P85'								=> array( 'Teclast', 'P85', TYPE_TABLET ),
 			'T720 SE'									=> array( 'Teclast', 'T720', TYPE_TABLET ),
 			'T760 from moage.com'						=> array( 'Teclast', 'T760', TYPE_TABLET ),
 			'tegav2'									=> array( 'Tegatech', 'TEGA v2', TYPE_TABLET ),
-			'TM-7024'									=> array( 'teXet', 'TM-7024', TYPE_TABLET ),
 			'TM-7025'									=> array( 'teXet', 'TM-7025', TYPE_TABLET ),
-			'TM-7037W'									=> array( 'teXet', 'TM-7037W', TYPE_TABLET ),
-			'TM-8041HD'									=> array( 'teXet', 'TM-8041HD', TYPE_TABLET ),
 			'MoFing'									=> array( 'Thomson', 'MoFing', TYPE_TABLET ),
 			'Ultimate10'								=> array( 'Tomtec', 'Ultimate10', TYPE_TABLET ),
 			'ThL V7'									=> array( 'THL', 'V7' ),
@@ -2710,12 +2015,6 @@ class DeviceModels {
 			'ThL V12'									=> array( 'THL', 'V12' ),
 			'ThL W1'									=> array( 'THL', 'W1' ),
 			'ThL W3'									=> array( 'THL', 'W3' ),
-			'ThL W3dc'									=> array( 'THL', 'W3' ),
-			'ThL W5'									=> array( 'THL', 'W5' ),
-			'ThL W7'									=> array( 'THL', 'W7' ),
-			'ThL W8'									=> array( 'THL', 'W8' ),
-			'TOOKY T83'									=> array( 'Tooky', 'T83' ),
-			'TOOKY T1982'								=> array( 'Tooky', 'T1982' ),
 			'TSB CLOUD COMPANION;TOSHIBA AC AND AZ'		=> array( 'Toshiba', 'Dynabook AZ', 'desktop' ),
 			'TOSHIBA AC AND AZ'							=> array( 'Toshiba', 'Dynabook AZ', 'desktop' ),
 			'TOSHIBA FOLIO AND A'						=> array( 'Toshiba', 'Folio 100', TYPE_TABLET ),
@@ -2728,10 +2027,7 @@ class DeviceModels {
 			'Tostab03'									=> array( 'Toshiba', 'Regza AT100', TYPE_TABLET ),
 			'AT100'										=> array( 'Toshiba', 'Regza AT100', TYPE_TABLET ),
 			'AT200'										=> array( 'Toshiba', 'Regza AT200', TYPE_TABLET ),
-			'AT270'										=> array( 'Toshiba', 'Regza AT270', TYPE_TABLET ),
 			'AT300'										=> array( 'Toshiba', 'Regza AT300', TYPE_TABLET ),
-			'AT300SE'									=> array( 'Toshiba', 'Regza AT300SE', TYPE_TABLET ),
-			'AT330'										=> array( 'Toshiba', 'Regza AT330', TYPE_TABLET ),
 			'AT470'										=> array( 'Toshiba', 'Regza AT470', TYPE_TABLET ),
 			'AT500'										=> array( 'Toshiba', 'Regza AT500', TYPE_TABLET ),
 			'AT570'										=> array( 'Toshiba', 'Regza AT570', TYPE_TABLET ),
@@ -2739,13 +2035,10 @@ class DeviceModels {
 			'Folio 100'									=> array( 'Toshiba', 'Folio 100', TYPE_TABLET ),
 			'folio100'									=> array( 'Toshiba', 'Folio 100', TYPE_TABLET ),
 			'THRiVE'									=> array( 'Toshiba', 'THRiVE', TYPE_TABLET ),
-			'TRACER OXYGEN GS1'							=> array( 'Tracer', 'Oxygen GS1' ),
-			'TREQ A10C'									=> array( 'Treq', 'A10C', TYPE_TABLET ),
 			'Fantastic T3'								=> array( 'TWM', 'Fantastic T3' ),
 			'TB100'										=> array( 'Unitech', 'TB100', TYPE_TABLET ),
 			'M70014'									=> array( 'United Star Technology', 'M70014', TYPE_TABLET ),
 			'UMI X1'									=> array( 'UMI', 'X1' ),
-			'U1203'										=> array( 'Uniscope', 'U1203' ),
 			'PS47'										=> array( 'Velocity Micro', 'Cruz PS47', TYPE_TABLET ),
 			'T301'										=> array( 'Velocity Micro', 'Cruz T301', TYPE_TABLET ),
 			'Vibo-A688'									=> array( 'FIH', 'Vibo A688' ),
@@ -2755,36 +2048,18 @@ class DeviceModels {
 			'TeamDRH ICS for GTablet'					=> array( 'ViewSonic', 'gTablet', TYPE_TABLET ),
 			'ViewPad7'									=> array( 'ViewSonic', 'ViewPad 7', TYPE_TABLET ),
 			'ViewPad 10e'								=> array( 'ViewSonic', 'ViewPad 10e', TYPE_TABLET ),
-			'ViewPad 10S'								=> array( 'ViewSonic', 'ViewPad 10s', TYPE_TABLET ),
-			'ViewPad97A'								=> array( 'ViewSonic', 'ViewPad 97a', TYPE_TABLET ),
-			'VSD220'									=> array( 'ViewSonic', 'VSD220', TYPE_DESKTOP ),
 			'VINUS V8'									=> array( 'Vinus', 'V8' ),
 			'vivo E1'									=> array( 'Vivo', 'E1' ),
-			'vivo E3'									=> array( 'Vivo', 'E3' ),
-			'vivo S1'									=> array( 'Vivo', 'S1' ),
-			'vivo S3'									=> array( 'Vivo', 'S3' ),
-			'vivo S3+'									=> array( 'Vivo', 'S3+' ),
-			'vivo S6'									=> array( 'Vivo', 'S6' ),
-			'vivo S6T'									=> array( 'Vivo', 'S6T' ),
 			'vivo S7'									=> array( 'Vivo', 'S7' ),
-			'vivo S9'									=> array( 'Vivo', 'S9' ),
-			'vivo S11t'									=> array( 'Vivo', 'S11' ),
-			'vivo S12'									=> array( 'Vivo', 'S12' ),
-			'vivo V1'									=> array( 'Vivo', 'V1' ),
 			'vivo V2'									=> array( 'Vivo', 'V2' ),
 			'vivo X1'									=> array( 'Vivo', 'X1' ),
-			'vivo Y3t'									=> array( 'Vivo', 'Y3T' ),
 			'VTAB1008'									=> array( 'Vizio', 'VTAB1008', TYPE_TABLET ),
 			'VTAB3010'									=> array( 'Vizio', 'VTAB3010', TYPE_TABLET ),
 			'VOTO W5300'								=> array( 'VOTO', 'W5300' ),
 			'Vsun i9'									=> array( 'Vsun Mobile', 'i9' ),
 			'xPAD-70'									=> array( 'WayteQ', 'xPAD-70', TYPE_TABLET ),
-			'xTAB-70!'									=> array( 'WayteQ', 'xTAB-70', TYPE_TABLET ),
+			'xTAB-70'									=> array( 'WayteQ', 'xTAB-70', TYPE_TABLET ),
 			'WellcoM-A99'								=> array( 'WellcoM', 'A99' ),
-			'WellcoM-A800'								=> array( 'WellcoM', 'A800', TYPE_TABLET ),
-			'WEXLER-TAB-7T'								=> array( 'Wexler', 'Tab 7T', TYPE_TABLET ),
-			'CINK KING'									=> array( 'Wiko', 'Cink King' ),
-			'CINK PEAX'									=> array( 'Wiko', 'Cink Peax' ),
 			'WIKO-CINK SLIM'							=> array( 'Wiko', 'Cink Slim' ),
 			'N5PRO2jingying'							=> array( 'Window', 'N5 Pro 2', TYPE_MEDIA ),
 			'N12'										=> array( 'Window', 'N12', TYPE_TABLET ),
@@ -2794,23 +2069,17 @@ class DeviceModels {
 			'N50GT'										=> array( 'Window', 'N50GT', TYPE_TABLET ),
 			'N50GT A'									=> array( 'Window', 'N50GT-A', TYPE_TABLET ),
 			'N70'										=> array( 'Window', 'N70', TYPE_TABLET ),
-			'N70DC'										=> array( 'Window', 'N70DC', TYPE_TABLET ),
 			'N70-S'										=> array( 'Window', 'N70S', TYPE_TABLET ),
 			'N70HD'										=> array( 'Window', 'N70HD', TYPE_TABLET ),
 			'N70 DUAL CORE'								=> array( 'Window', 'N70 Dual Core', TYPE_TABLET ),
-			'N70DC-S'									=> array( 'Window', 'N70 Dual Core', TYPE_TABLET ),
 			'N70DC-T'									=> array( 'Window', 'N70 Dual Core', TYPE_TABLET ),
 			'N80($| from moage.com)!'					=> array( 'Window', 'N80', TYPE_TABLET ),
 			'N80DC'										=> array( 'Window', 'N80 Dual Core', TYPE_TABLET ),
-			'N80IPS'									=> array( 'Window', 'N80 IPS', TYPE_TABLET ),
 			'N90'										=> array( 'Window', 'N90', TYPE_TABLET ),
 			'N90 DUAL CORE!'							=> array( 'Window', 'N90 Dual Core', TYPE_TABLET ),
 			'N101 DUAL CORE!'							=> array( 'Window', 'N101 Dual Core', TYPE_TABLET ),
 			'N612'										=> array( 'Wishway', 'N612' ),
-			'A81E'										=> array( 'Witstech', 'A81E', TYPE_TABLET ),
 			'AT-AS43D'									=> array( 'Wolfgang', 'AT-AS43D' ),
-			'AT-AS43D2'									=> array( 'Wolfgang', 'AT-AS43D2' ),
-			'AT-AS45SE'									=> array( 'Wolfgang', 'AT-AS45SE' ),
 			'M12'										=> array( 'Wopad', 'M12', TYPE_TABLET ),
 			'WM8650'									=> array( 'WonderMedia', 'WM8650', TYPE_TABLET ),
 			'WM8850-mid'								=> array( 'WonderMedia', 'WM8850', TYPE_TABLET ),
@@ -2818,13 +2087,10 @@ class DeviceModels {
 			'MI 1S'										=> array( 'Xiaomi', 'MI-ONE S' ),
 			'MI 1SC'									=> array( 'Xiaomi', 'MI-ONE SC' ),
 			'MI-ONE C1'									=> array( 'Xiaomi', 'MI-ONE C1' ),
-			'MI-ONE Plus!'								=> array( 'Xiaomi', 'MI-ONE Plus' ),
+			'MI-ONE Plus'								=> array( 'Xiaomi', 'MI-ONE Plus' ),
 			'mione plus'								=> array( 'Xiaomi', 'MI-ONE Plus' ),
 			'MI 2'										=> array( 'Xiaomi', 'MI-TWO' ),
-			'MI 2C'										=> array( 'Xiaomi', 'MI-TWO' ),
 			'MI-TWO'									=> array( 'Xiaomi', 'MI-TWO' ),
-			'X403'										=> array( 'Xtouch', 'X403' ),
-			'X506'										=> array( 'Xtouch', 'X506' ),
 			'Q07CL01'									=> array( 'XVision', 'Q07', TYPE_TABLET ),
 			'N6'										=> array( 'Yarvik', 'TAB210 Tablet', TYPE_TABLET ),
 			'TAB224'									=> array( 'Yarvik', 'TAB224 GoTab Velocity', TYPE_TABLET ),
@@ -2869,20 +2135,16 @@ class DeviceModels {
 			'ZTE V788!'									=> array( 'ZTE', 'V788 Kis' ),
 			'ZTE U788!'									=> array( 'ZTE', 'U788 Kis' ),
 			'ZTE U790'									=> array( 'ZTE', 'U790' ),
-			'ZTE V790'									=> array( 'ZTE', 'V790' ),
-			'ZTE V791'									=> array( 'ZTE', 'V791' ),
-			'ZTE V793'									=> array( 'ZTE', 'V793' ),
 			'ZTE U795'									=> array( 'ZTE', 'U795' ),
 			'ZTE T U802'								=> array( 'ZTE', 'U802' ),
 			'RacerII'									=> array( 'ZTE', 'U806 Racer II' ),
 			'ZTE T U806'								=> array( 'ZTE', 'U806 Racer II' ),
-			'ZTE U807'									=> array( 'ZTE', 'U807' ),
 			'E810'										=> array( 'ZTE', 'E810' ),
 			'ZTE T U812'								=> array( 'ZTE', 'U812' ),
-			'ZTE U817'									=> array( 'ZTE', 'U817' ),
 			'ZTE GV821'									=> array( 'ZTE', 'V821' ),
 			'ZTE T U830'								=> array( 'ZTE', 'U830' ),		
 			'ZTE Racer'									=> array( 'ZTE', 'X850 Racer' ),
+			'MTC 916'									=> array( 'ZTE', 'X850 Racer' ),
 			'Racer'										=> array( 'ZTE', 'X850 Racer' ),
 			'ZTE U X850'								=> array( 'ZTE', 'X850 Racer' ),
 			'ZTE U V852'								=> array( 'ZTE', 'V852 Dreamer' ),
@@ -2905,9 +2167,7 @@ class DeviceModels {
 			'Blade(-V880|-opda)?$!'						=> array( 'ZTE', 'V880 Blade' ),
 			'ZTE N880E'									=> array( 'ZTE', 'N880E' ),
 			'ZTE N880F'									=> array( 'ZTE', 'N880F' ),
-			'ZTE N880G'									=> array( 'ZTE', 'N880G' ),
 			'ZTE N881E'									=> array( 'ZTE', 'N881E' ),
-			'ZTE N881F'									=> array( 'ZTE', 'N881F' ),
 			'BLADEII'									=> array( 'ZTE', 'V881 Blade II' ),
 			'Blade2'									=> array( 'ZTE', 'V881 Blade II' ),
 			'ZTE U V881'								=> array( 'ZTE', 'V881 Blade II' ),		
@@ -2924,7 +2184,6 @@ class DeviceModels {
 			'ZTE Grand X'								=> array( 'ZTE', 'U930 Grand X' ),
 			'Grand X In'								=> array( 'ZTE', 'U930 Grand X' ),
 			'ZTE U930 Ultimate'							=> array( 'ZTE', 'U930 Grand X' ),
-			'ZTE U935'									=> array( 'ZTE', 'U935' ),
 			'ZTE U950'									=> array( 'ZTE', 'U950' ),
 			'ZTE V955'									=> array( 'ZTE', 'V955' ),
 			'ZTE (U )?V960!'							=> array( 'ZTE', 'V960 Skate' ),
@@ -2933,30 +2192,18 @@ class DeviceModels {
 			'ZTE U960s3'								=> array( 'ZTE', 'U960s3' ),
 			'ZTE N970'									=> array( 'ZTE', 'N970 Grand X' ),
 			'ZTE U970'									=> array( 'ZTE', 'U970 Grand X' ),
-			'ZTE V970!'									=> array( 'ZTE', 'Z970 Grand X' ),
-			'ZTE N983'									=> array( 'ZTE', 'N983' ),
-			'Grand X Pro'								=> array( 'ZTE', 'V983 Grand X Pro' ),
+			'ZTE V970'									=> array( 'ZTE', 'Z970 Grand X' ),
 			'ZTE U985'									=> array( 'ZTE', 'U985 Grand Era' ),
-			'ZTE V985'									=> array( 'ZTE', 'V985 Grand Era' ),
-			'ZTE V987'									=> array( 'ZTE', 'V987' ),
 			'ZTE Roamer'								=> array( 'ZTE', 'Z990 Roamer ' ),
 			'ZTE Z990!'									=> array( 'ZTE', 'Z990 Roamer' ),
-			'V8000 USA Cricket'							=> array( 'ZTE', 'V8000 Engage' ),
-			'X501 USA Cricket'							=> array( 'ZTE', 'X501 Groove' ),
-			'ZXY-ZTE V6700'								=> array( 'ZTE', 'V6700' ),
-			'N9100'										=> array( 'ZTE', 'N9100 Force' ),
-			'ZTE N9120'									=> array( 'ZTE', 'N9120 Avid' ),
 			'N9500'										=> array( 'ZTE', 'N9500 Flash' ),
 			'003Z'										=> array( 'ZTE', 'Softbank 003Z' ),
 			'008Z'										=> array( 'ZTE', 'Softbank 008Z' ),
 			'009Z'										=> array( 'ZTE', 'Softbank Star7' ),
-			'(Zopo )?ZP100!'							=> array( 'Zopo', 'ZP100 Pilot' ),
-			'ZP200'										=> array( 'Zopo', 'ZP200 Shining' ),
-			'ZP300'										=> array( 'Zopo', 'ZP300 Field' ),
-			'ZP300+'									=> array( 'Zopo', 'ZP300 Field Plus' ),
-			'ZP500'										=> array( 'Zopo', 'ZP500 Libero' ),
-			'(Zopo )?ZP900!'							=> array( 'Zopo', 'ZP900 Leader' ),
-			'ZP950'										=> array( 'Zopo', 'ZP950 Phablet' ),
+			'ZP100'										=> array( 'Zopo', 'ZP100' ),
+			'ZP200'										=> array( 'Zopo', 'ZP200' ),
+			'ZP300'										=> array( 'Zopo', 'ZP300' ),
+			'ZP500'										=> array( 'Zopo', 'ZP500' ),
 	
 			/* Telecom provider branded devices */
 			'i-mobile i691'								=> array( 'i-Mobile', 'i691' ),
@@ -2964,24 +2211,14 @@ class DeviceModels {
 			'i-mobile i858'								=> array( 'i-Mobile', 'i858' ),
 			'i-mobile 3G 8500'							=> array( 'i-Mobile', '3G 8500' ),
 			'i-mobile IQ 1'								=> array( 'i-Mobile', 'iQ 1' ),	
-			'i-mobile IQ 2'								=> array( 'i-Mobile', 'iQ 2' ),	
-			'i-mobile IQ 2A'							=> array( 'i-Mobile', 'iQ 2A' ),	
-			'i-mobile IQ 5'								=> array( 'i-Mobile', 'iQ 5' ),	
-			'i-mobile IQ 6'								=> array( 'i-Mobile', 'iQ 6' ),	
-			'i-mobile IQ 6A'							=> array( 'i-Mobile', 'iQ 6A' ),	
-			'i-STYLE 1'									=> array( 'i-Mobile', 'i-Style 1' ),	
 			'i-mobile i-style 3'						=> array( 'i-Mobile', 'i-Style 3' ),	
-			'i-mobile i-STYLE 4'						=> array( 'i-Mobile', 'i-Style 4' ),	
-			'i-MOBILE i-STYLE 5'						=> array( 'i-Mobile', 'i-Style 5' ),	
 			'i-mobile i-style Q1'						=> array( 'i-Mobile', 'i-Style Q1' ),						
 			'i-mobile i-STYLE Q2'						=> array( 'i-Mobile', 'i-Style Q2' ),			
 			'i-mobile i-STYLE Q2 DUO'					=> array( 'i-Mobile', 'i-Style Q2 Duo' ),
-			'i-STYLE Q2 DUO'							=> array( 'i-Mobile', 'i-Style Q2 Duo' ),
 			'i-mobile i-style Q3'						=> array( 'i-Mobile', 'i-Style Q3' ),				
 			'i-mobile i-STYLE Q6'						=> array( 'i-Mobile', 'i-Style Q6' ),						
 			'i-mobile I-Note'							=> array( 'i-Mobile', 'i-Note', TYPE_TABLET ),
 			'i-mobile i-note WiFi 7'					=> array( 'i-Mobile', 'i-Note 7', TYPE_TABLET ),
-			'i-mobile i-note WiFi 9'					=> array( 'i-Mobile', 'i-Note 9', TYPE_TABLET ),
 	
 			'Etisalat Smartphone'						=> array( 'Etisalat', 'Smartphone' ),	
 			
@@ -2990,7 +2227,6 @@ class DeviceModels {
 			'Optimus Monte Carlo'						=> array( 'Optimus', 'Monte Carlo' ),						/* ZTE Skate */
 			
 			'Orange Boston'								=> array( 'Orange', 'Boston' ),								/* Gigabyte GSmart G1305 */
-			'Orange Daytona'							=> array( 'Orange', 'Daytona' ),						
 			'Orange Monte Carlo'						=> array( 'Orange', 'Monte Carlo' ),						/* ZTE Skate */
 			'San Francisco'								=> array( 'Orange', 'San Francisco' ),						/* ZTE Blade */
 			'San Francisco for Orange'					=> array( 'Orange', 'San Francisco' ),						/* ZTE Blade */
@@ -3018,35 +2254,18 @@ class DeviceModels {
 			'T-Mobile myTouch Q'						=> array( 'T-Mobile', 'myTouch Q' ),						/* Huawei U8730 */
 			'LG-C800'									=> array( 'T-Mobile', 'myTouch Q' ),
 			'Pulse Mini'								=> array( 'T-Mobile', 'Pulse Mini' ),						/* Huawei U8110 */
-			'T-Mobile Vivacity'							=> array( 'T-Mobile', 'Vivacity' ),				
-			
-			'Telenor OneTouch'							=> array( 'Telenor', 'One Touch' ),
-			'Telenor One Touch S'						=> array( 'Telenor', 'One Touch S' ),
-			'Telenor Touch Plus'						=> array( 'Telenor', 'Touch Plus' ),
 			
 			'Turkcell Maxi Plus 5'						=> array( 'Turkcell', 'Maxi Plus 5' ),
 			'Turkcell T20'								=> array( 'Turkcell', 'T20' ),
 		
-			'MTC 916'									=> array( 'MTC', '916' ),
 			'MTC 950'									=> array( 'MTC', '950' ),
 			'MTC 955'									=> array( 'MTC', '955' ),
 			'MTC 960'									=> array( 'MTC', '960' ),
 			'MTC Evo'									=> array( 'MTC', 'Evo' ),
-			'MTC Neo'									=> array( 'MTC', 'Neo' ),
-			'MTC Viva'									=> array( 'MTC', 'Viva' ),
-			
-			'QMobile A7'								=> array( 'Q-Mobile', 'Noir A7' ),
-			'QMobile A8'								=> array( 'Q-Mobile', 'Noir A8' ),
-			'Qmobile-S11'								=> array( 'Q-Mobile', 'S11' ),
-			'Q-Smart S18'								=> array( 'Q-Mobile', 'Q-Smart S18' ),
-			'Q-Smart S20'								=> array( 'Q-Mobile', 'Q-Smart S20' ),
 			
 			'Vodafone 845'								=> array( 'Vodafone', '845 Nova' ),							/* Huawei U8100 */
 			'Vodafone 858'								=> array( 'Vodafone', '858 Smart' ),						/* Huawei U8160 */
-			'Vodafone 861'								=> array( 'Vodafone', '861 Smart' ),
 			'Vodafone 945'								=> array( 'Vodafone', '945' ),								/* ZTE Joe */
-			'Vodafone 958'								=> array( 'Vodafone', '958' ),
-			'Vodafone Smart ll'							=> array( 'Vodafone', 'Smart II' ),
 			'Vodafone Smart II'							=> array( 'Vodafone', 'Smart II' ),
 			'SmartTabII7'								=> array( 'Vodafone', 'SmartTab II 7', TYPE_TABLET ),		/* Lenovo */
 			'SmartTab10'								=> array( 'Vodafone', 'SmartTab 10', TYPE_TABLET )			/* ZTE Web Tab 10 */
@@ -3069,7 +2288,6 @@ class DeviceModels {
 			'Coolpad D508'								=> array( 'Coolpad', 'D508' ),
 			'Coolpad E600'								=> array( 'Coolpad', 'E600' ),
 			'SCH-F839'									=> array( 'Samsung', 'SCH-F839' ),
-			'SCH-M519!'									=> array( 'Samsung', 'Metro TV' ),
 			'HS-E316!'									=> array( 'Hisense', 'E316' ),
 		);
 		
@@ -3177,20 +2395,17 @@ class DeviceModels {
 			'LG-E-?900!'								=> array( 'LG', 'Optimus 7 E900' ),
 			'LG-E906'									=> array( 'LG', 'Jil Sander' ),
 			'LG-C900!'									=> array( 'LG', 'Optimus 7Q' ),
-			'Lumia 505'									=> array( 'Nokia', 'Lumia 505' ),
-			'(Lumia ?|Nokia ?)?510!'					=> array( 'Nokia', 'Lumia 510' ),
-			'(Lumia ?|Nokia ?)?610!'					=> array( 'Nokia', 'Lumia 610' ),
-			'(Lumia ?|Nokia ?)?620!'					=> array( 'Nokia', 'Lumia 620' ),
-			'(Lumia ?|Nokia ?)?710!'					=> array( 'Nokia', 'Lumia 710' ),
+			'(Lumia ?|Nokia )?510!'						=> array( 'Nokia', 'Lumia 510' ),
+			'(Lumia ?|Nokia )?610!'						=> array( 'Nokia', 'Lumia 610' ),
+			'(Lumia ?|Nokia )?710!'						=> array( 'Nokia', 'Lumia 710' ),
 			'Lumia 719'									=> array( 'Nokia', 'Lumia 719' ),
-			'(Lumia ?|Nokia ?)?800!'					=> array( 'Nokia', 'Lumia 800' ),
+			'(Lumia ?|Nokia )?800!'						=> array( 'Nokia', 'Lumia 800' ),
 			'SeaRay'									=> array( 'Nokia', 'Lumia 800' ),
 			'Lumia ?810!'								=> array( 'Nokia', 'Lumia 810' ),
 			'Lumia ?820!'								=> array( 'Nokia', 'Lumia 820' ),
 			'Lumia ?822!'								=> array( 'Nokia', 'Lumia 822' ),
-			'(Lumia ?|Nokia ?)?900!'					=> array( 'Nokia', 'Lumia 900' ),
-			'(Lumia ?|Nokia ?)?920!'					=> array( 'Nokia', 'Lumia 920' ),
-			'RM-8(20|21)!'								=> array( 'Nokia', 'Lumia 920' ),
+			'(Lumia ?|Nokia )?900!'						=> array( 'Nokia', 'Lumia 900' ),
+			'(Lumia ?|Nokia )?920!'						=> array( 'Nokia', 'Lumia 920' ),
 			'GT-I8350!'									=> array( 'Samsung', 'Omnia W' ),
 			'GT-i8700'									=> array( 'Samsung', 'Omnia 7' ),
 			'GT-I8750'									=> array( 'Samsung', 'Ativ S' ),
@@ -3213,7 +2428,7 @@ class DeviceModels {
 		);
 		
 		static $S40_MODELS = array(
-			'C1-01!'									=> array( 'Nokia', 'C1-01' ),
+			'C1-01'										=> array( 'Nokia', 'C1-01' ),
 			'C1-02'										=> array( 'Nokia', 'C1-02' ),
 			'C2-00'										=> array( 'Nokia', 'C2-00' ),
 			'C2-01'										=> array( 'Nokia', 'C2-01' ),
@@ -3242,9 +2457,8 @@ class DeviceModels {
 			'303'										=> array( 'Nokia', 'Asha 303' ),
 			'305'										=> array( 'Nokia', 'Asha 305' ),
 			'306'										=> array( 'Nokia', 'Asha 306' ),
-			'308'										=> array( 'Nokia', 'Asha 308' ),
 			'309'										=> array( 'Nokia', 'Asha 309' ),
-			'310'										=> array( 'Nokia', 'Asha 311' ),
+			'308'										=> array( 'Nokia', 'Asha 308' ),
 			'311'										=> array( 'Nokia', 'Asha 311' ),
 			'1682c'										=> array( 'Nokia', '1682 classic' ),
 			'2220s!'									=> array( 'Nokia', '2220 slide' ),
@@ -3286,7 +2500,6 @@ class DeviceModels {
 			'7070!'										=> array( 'Nokia', '7070 Prism' ),
 			'7100s!'									=> array( 'Nokia', '7100 Supernova' ),
 			'7210s!'									=> array( 'Nokia', '7210 Supernova' ),
-			'7210Supernova!'							=> array( 'Nokia', '7210 Supernova' ),					
 			'7230'										=> array( 'Nokia', '7230' ),
 			'7310c!'									=> array( 'Nokia', '7310 Supernova' ),
 			'7510Supernova!'							=> array( 'Nokia', '7510 Supernova' ),
@@ -3410,27 +2623,17 @@ class DeviceModels {
 		);
 		
 		static $FEATURE_MODELS = array(
-			'J105i'										=> array( 'Sony Ericsson', 'Naite' ),
 			'J108[ai]!'									=> array( 'Sony Ericsson', 'Cedar' ),
-			'J10i2'										=> array( 'Sony Ericsson', 'Elm' ),
 			'J20'										=> array( 'Sony Ericsson', 'Hazel' ),
 			'KC910i'									=> array( 'LG', 'KC910i Renoir' ),
 			'KP500!'									=> array( 'LG', 'KP500 Cookie' ),
-			'KU990i'									=> array( 'LG', 'KU990 Viewty' ),
-			'GM360'										=> array( 'LG', 'GM360 Viewty Snap' ),
 			'GS500'										=> array( 'LG', 'GS500 Cookie Plus' ),
-			'GT550'										=> array( 'LG', 'GT550 Encore' ),
-			'GT-C3322'									=> array( 'Samsung', 'GT-C3322 Duos' ),
-			'GT-E2152'									=> array( 'Samsung', 'GT-E2152 Duos' ),
 			'GT-S3350'									=> array( 'Samsung', 'Ch@t 335' ),
 			'GT-S3570'									=> array( 'Samsung', 'Ch@t 357' ),
-			'GT-S5229'									=> array( 'Samsung', 'Tocco Lite 2' ),
-			'GT-S5610!'									=> array( 'Samsung', 'Primo' ),
+			'GT-S5610K'									=> array( 'Samsung', 'Primo' ),
 			'SGH-A667'									=> array( 'Samsung', 'A667 Evergreen' ),
-			'SGH-A877'									=> array( 'Samsung', 'A877 Impression' ),
-			'SGH-S390G'									=> array( 'Samsung', 'S390 TracFone' )
 		);
-		
+
 		static $BLACKBERRY_MODELS = array(
 			'9000'		=> 'Bold',
 			'9600'		=> 'Bold',
@@ -3465,7 +2668,6 @@ class DeviceModels {
 			'8230'		=> 'Pearl',
 			'9100'		=> 'Pearl',
 			'9105'		=> 'Pearl',
-			'9500'		=> 'Storm',
 			'9530'		=> 'Storm',
 			'9550'		=> 'Storm',
 			'9670'		=> 'Style',
@@ -3565,7 +2767,6 @@ function cleanup($s = '') {
 			$s = preg_replace('/^tita on /', '', $s);
 			$s = preg_replace('/^ICS AOSP on /', '', $s);
 			$s = preg_replace('/^Android (on |for )/', '', $s);
-			$s = preg_replace('/^Generic Android on /', '', $s);
 			$s = preg_replace('/^Full (AOSP on |Android on |Cappuccino on |MIPS Android on |Android)/', '', $s);
 
 			$s = preg_replace('/^Acer( |-)?/i', '', $s);
@@ -3581,7 +2782,6 @@ function cleanup($s = '') {
 			$s = preg_replace('/^HW-/', '', $s);
 			$s = preg_replace('/^Huawei[ -]/i', 'Huawei ', $s);
 			$s = preg_replace('/^SAMSUNG[ -]/i', '', $s);
-			$s = preg_replace('/^SAMSUNG SAMSUNG-/i', '', $s);
 			$s = preg_replace('/^(Sony ?Ericsson|Sony)/', '', $s);
 			$s = preg_replace('/^(Lenovo Lenovo|LNV-Lenovo|LENOVO-Lenovo)/', 'Lenovo', $s);
 			$s = preg_replace('/^Lenovo-/', 'Lenovo', $s);
@@ -3640,37 +2840,6 @@ function __construct($headers) {
 			if (isset($this->headers['X-Original-User-Agent'])) $this->analyseAlternativeUserAgent($this->headers['X-Original-User-Agent']);
 			if (isset($this->headers['X-Device-User-Agent'])) $this->analyseAlternativeUserAgent($this->headers['X-Device-User-Agent']);
 			if (isset($this->headers['Device-Stock-UA'])) $this->analyseAlternativeUserAgent($this->headers['Device-Stock-UA']);
-
-			if (isset($this->headers['X-Requested-With'])) $this->analyseBrowserId($this->headers['X-Requested-With']);
-		}
-		
-		function analyseBrowserId($id) {
-			$browser = BrowserIds::identify('android', $id);
-			if ($browser) {
-				if (!isset($this->browser->name) || $this->browser->name != $browser) {
-					$this->browser->name = $browser;
-					$this->browser->version = null;
-					$this->browser->stock = false;
-				}
-			}
-
-			if ($this->os->name != 'Android' && $this->os->name != 'Aliyun OS') {
-				$this->os->name = 'Android';
-				$this->os->version = null;
-				
-				$this->device->manufacturer = null;
-				$this->device->model = null;
-				$this->device->identified = false;
-				
-				if ($this->device->type != TYPE_MOBILE && $this->device->type != TYPE_TABLET) {
-					$this->device->type = TYPE_MOBILE;
-				}
-			}
-			
-			if ($this->engine->name != 'Webkit') {
-				$this->engine->name = 'Webkit';
-				$this->engine->version = null;
-			}
 		}
 		
 		function analyseAlternativeUserAgent($ua) {
@@ -3703,12 +2872,6 @@ function analyseUCUserAgent($ua) {
 		function analysePuffinUserAgent($ua) {
 			$parts = explode('/', $ua);
 			
-			if ($this->browser->name != 'Puffin') {
-				$this->browser->name = 'Puffin';
-				$this->browser->version = null;
-				$this->browser->stock = false;
-			}
-		
 			$this->device->type = 'mobile';
 			
 			if (count($parts) > 1 && $parts[0] == 'Android') {
@@ -3722,31 +2885,6 @@ function analysePuffinUserAgent($ua) {
 					$this->device = $device;
 				}
 			}
-
-			if (count($parts) > 1 && $parts[0] == 'iPhone OS') {
-				if (!isset($this->os->name) || $this->os->name != 'iOS') {
-					$this->os->name = 'iOS';
-					$this->os->version = null;
-				}
-				
-				if (preg_match('/iPod( touch)?/', $parts[1])) {
-					$this->device->type = TYPE_MEDIA;
-					$this->device->manufacturer = 'Apple';
-					$this->device->model = 'iPod touch';
-				} 
-				else if (preg_match('/(?:Unknown )?iPhone( 3G| 3GS| 4| 4S| 5)?/', $parts[1], $match)) {
-					$this->device->type = TYPE_MOBILE;
-					$this->device->manufacturer = 'Apple';
-					$this->device->model = 'iPhone' . (isset($match[1]) ? $match[1] : '');
-				} 
-				else if (preg_match('/iPad/', $parts[1])) {
-					$this->device->type = TYPE_TABLET;
-					$this->device->manufacturer = 'Apple';
-					$this->device->model = 'iPad';
-				}
-				
-				$this->device->identified = true;
-			}
 		}
 		
 		function analyseUserAgent($ua) {
@@ -3793,23 +2931,6 @@ function analyseUserAgent($ua) {
 			}
 			
 			
-			/****************************************************
-			 *		Solaris
-			 */
-		
-			if (preg_match('/IRIX/', $ua)) {
-				$this->os->name = 'IRIX';
-
-				if (preg_match('/IRIX ([0-9.]*)/', $ua, $match)) {
-					$this->os->version = new Version(array('value' => $match[1]));
-				}
-
-				if (preg_match('/IRIX;(?:64|32) ([0-9.]*)/', $ua, $match)) {
-					$this->os->version = new Version(array('value' => $match[1]));
-				}
-			}
-			
-			
 			/****************************************************
 			 *		Syllable
 			 */
@@ -4018,8 +3139,6 @@ function analyseUserAgent($ua) {
 					$this->os->version = new Version(array('value' => $match[1]));
 					
 					switch($match[1]) {
-						case '6.3':		$this->os->version = new Version(array('value' => $match[1], 'alias' => '"Blue"')); break;
-
 						case '6.2':		if (preg_match('/; ARM;/', $ua))
 											$this->os->version = new Version(array('value' => $match[1], 'alias' => 'RT')); 
 										else
@@ -4095,7 +3214,7 @@ function analyseUserAgent($ua) {
 					$this->device->type = TYPE_MOBILE;
 				}
 
-				if (preg_match('/Windows ?Mobile/', $ua)) {
+				if (preg_match('/Windows Mobile/', $ua)) {
 					$this->os->name = 'Windows Mobile';
 					$this->device->type = TYPE_MOBILE;
 				}
@@ -4342,17 +3461,8 @@ function analyseUserAgent($ua) {
 				$this->os->name = 'BlackBerry';
 				$this->os->version = new Version(array('value' => $match[1], 'details' => 2));
 				
-				$this->device->manufacturer = 'BlackBerry';
-				$this->device->model = $match[2];
-				
-				if ($this->device->model == 'Kbd') {
-					$this->device->model = 'Q10';
-				} 
-				
-				if ($this->device->model == 'Touch') {
-					$this->device->model = 'Z10 or Dev Alpha';
-				} 
-				
+				$this->device->manufacturer = 'RIM';
+				$this->device->model = 'BlackBerry ' . $match[2];
 				$this->device->type = preg_match('/Mobile/', $ua) ? TYPE_MOBILE : TYPE_TABLET;
 				$this->device->identified = true;
 
@@ -4392,10 +3502,10 @@ function analyseUserAgent($ua) {
 			 *		WebOS
 			 */
 		
-			if (preg_match('/(?:web|hpw)OS\/(?:HP webOS )?([0-9.]*)/', $ua, $match)) {
+			if (preg_match('/(?:web|hpw)OS\/([0-9.]*)/', $ua, $match)) {
 				$this->os->name = 'webOS';
 				$this->os->version = new Version(array('value' => $match[1], 'details' => 2));
-				$this->device->type = preg_match('/Tablet/i', $ua) ? TYPE_TABLET : TYPE_MOBILE;
+				$this->device->type = preg_match('/Tablet/', $ua) ? TYPE_TABLET : TYPE_MOBILE;
 
 				if (preg_match('/Pre\/1.0/', $ua)) $this->device->model = 'Pre';
 				if (preg_match('/Pre\/1.1/', $ua)) $this->device->model = 'Pre Plus';
@@ -4617,15 +3727,6 @@ function analyseUserAgent($ua) {
 				$this->device->type = TYPE_MOBILE;
 			}
 
-			/****************************************************
-			 *		MAUI Runtime
-			 */
-		
-			if (preg_match('/\(MAUI Runtime;/', $ua)) {
-				$this->os->name = 'MAUI Runtime';
-				$this->device->type = TYPE_MOBILE;
-			}
-
 			/****************************************************
 			 *		CrOS
 			 */
@@ -4645,15 +3746,6 @@ function analyseUserAgent($ua) {
 				$this->device->type = TYPE_DESKTOP;
 			}
 			
-			/****************************************************
-			 *		BeOS
-			 */
-		
-			if (preg_match('/BeOS/', $ua)) {
-				$this->os->name = 'BeOS';
-				$this->device->type = TYPE_DESKTOP;
-			}
-			
 			/****************************************************
 			 *		Haiku
 			 */
@@ -4676,7 +3768,7 @@ function analyseUserAgent($ua) {
 			 *		OS/2 Warp
 			 */
 		
-			if (preg_match('/OS\/2; (?:U; )?Warp ([0-9.]*)/i', $ua, $match)) {
+			if (preg_match('/OS\/2; Warp ([0-9.]*)/i', $ua, $match)) {
 				$this->os->name = 'OS/2 Warp';
 				$this->os->version = new Version(array('value' => $match[1]));
 				$this->device->type = TYPE_DESKTOP;
@@ -4712,15 +3804,6 @@ function analyseUserAgent($ua) {
 				$this->device->type = TYPE_DESKTOP;
 			}
 			
-			/****************************************************
-			 *		AROS
-			 */
-		
-			if (preg_match('/AROS/', $ua, $match)) {
-				$this->os->name = 'AROS';
-				$this->device->type = TYPE_DESKTOP;
-			}
-			
 			/****************************************************
 			 *		Kindle
 			 */
@@ -4796,20 +3879,6 @@ function analyseUserAgent($ua) {
 				$this->device->identified = true;
 			}
 
-			/****************************************************
-			 *		Tesla Model S in-car browser
-			 */
-		
-			if (preg_match('/QtCarBrowser/', $ua)) {
-				$this->os->name = '';
-				
-				$this->device->manufacturer = 'Tesla';
-				$this->device->model = 'Model S';
-				$this->device->type = TYPE_CAR;
-				$this->device->identified = true;
-			}
-
-
 			/****************************************************
 			 *		Nintendo
 			 *
@@ -5214,7 +4283,7 @@ function analyseUserAgent($ua) {
 					}
 
 					if (!isset($this->device->model) && $modelName != '' && $modelName != 'modelName') {
-						switch($modelName) {
+						switch(modelName) {
 							case 'GLOBAL_PLAT3':	$this->device->model = 'NetCast TV'; break;
 							case 'GLOBAL_PLAT4':	$this->device->model = 'NetCast TV'; break;
 							case 'SmartTV2012':		$this->device->model = 'Smart TV 2012'; break;
@@ -5761,9 +4830,99 @@ function analyseUserAgent($ua) {
 				}
 			}
 
-			if (preg_match('/\(IE ([0-9.]*)/', $ua, $match)) {
-				$this->browser->name = 'Internet Explorer';
-				$this->browser->version = new Version(array('value' => $match[1]));
+			/****************************************************
+			 *		Opera
+			 */
+		
+			if (preg_match('/Opera/i', $ua)) {
+				$this->browser->stock = false;
+				$this->browser->name = 'Opera';
+
+				if (preg_match('/Opera[\/| ]([0-9.]*)/', $ua, $match)) {
+					$this->browser->version = new Version(array('value' => $match[1]));
+				}
+
+				if (preg_match('/Version\/([0-9.]*)/', $ua, $match)) {
+					if (floatval($match[1]) >= 10)
+						$this->browser->version = new Version(array('value' => $match[1]));
+					else
+						$this->browser->version = null;
+				}
+
+				if (is_array($this->browser->version) && preg_match('/Edition Labs/', $ua)) {
+					$this->browser->channel = 'Labs';
+				}
+				
+				if (is_array($this->browser->version) && preg_match('/Edition Next/', $ua)) {
+					$this->browser->channel = 'Next';
+				}
+				
+				if (preg_match('/Opera Tablet/', $ua)) {
+					$this->browser->name = 'Opera Mobile';
+					$this->device->type = TYPE_TABLET;
+				}
+				
+				if (preg_match('/Opera Mobi/', $ua)) {
+					$this->browser->name = 'Opera Mobile';
+					$this->device->type = TYPE_MOBILE;
+				}
+
+				if (preg_match('/Opera Mini;/', $ua)) {
+					$this->browser->name = 'Opera Mini';
+					$this->browser->version = null;
+					$this->browser->mode = 'proxy';
+					$this->device->type = TYPE_MOBILE;
+				}
+				
+				if (preg_match('/Opera Mini\/(?:att\/)?([0-9.]*)/', $ua, $match)) {
+					$this->browser->name = 'Opera Mini';
+					$this->browser->version = new Version(array('value' => $match[1], 'details' => (intval(substr(strrchr($match[1], '.'), 1)) > 99 ? -1 : null)));
+					$this->browser->mode = 'proxy';
+					$this->device->type = TYPE_MOBILE;
+				}
+				
+				if ($this->browser->name == 'Opera' && $this->device->type == TYPE_MOBILE) {
+					$this->browser->name = 'Opera Mobile';
+					
+					if (preg_match('/BER/', $ua)) {
+						$this->browser->name = 'Opera Mini';
+						$this->browser->version = null;
+					}
+				}
+
+				if (preg_match('/InettvBrowser/', $ua)) {
+					$this->device->type = TYPE_TELEVISION;
+				}
+
+				if (preg_match('/Opera[ -]TV/', $ua)) {
+					$this->browser->name = 'Opera';
+					$this->device->type = TYPE_TELEVISION;
+				}
+
+				if (preg_match('/Linux zbov/', $ua)) {
+					$this->browser->name = 'Opera Mobile';
+					$this->browser->mode = 'desktop';
+
+					$this->device->type = TYPE_MOBILE;
+
+					$this->os->name = null;
+					$this->os->version = null;
+				}
+
+				if (preg_match('/Linux zvav/', $ua)) {
+					$this->browser->name = 'Opera Mini';
+					$this->browser->version = null;
+					$this->browser->mode = 'desktop';
+
+					$this->device->type = TYPE_MOBILE;
+
+					$this->os->name = null;
+					$this->os->version = null;
+				}
+				
+				if ($this->device->type == '') {
+					$this->device->type = TYPE_DESKTOP;
+				}
 			}
 
 			/****************************************************
@@ -5865,14 +5024,6 @@ function analyseUserAgent($ua) {
 					$this->device->type = TYPE_DESKTOP;
 				}
 			}
-			
-			if (preg_match('/PmWFx\/([0-9ab.]*)/', $ua, $match)) {
-				$this->browser->stock = false;
-				$this->browser->name = 'SeaMonkey';
-				$this->browser->version = new Version(array('value' => $match[1]));
-			}
-			
-			
 
 			/****************************************************
 			 *		Netscape
@@ -5918,7 +5069,6 @@ function analyseUserAgent($ua) {
 							$this->browser->channel = 'Beta';
 							break;
 						case '18.0.1025':
-						case '25.0.1364':
 							$this->browser->version->details = 1;
 							break;
 						default:	
@@ -5960,8 +5110,6 @@ function analyseUserAgent($ua) {
 						case '22.0.1229':
 						case '23.0.1271':
 						case '24.0.1312':
-						case '25.0.1364':
-						case '26.0.1410':
 							$this->browser->version->details = 1;
 							break;
 						default:	
@@ -5994,112 +5142,6 @@ function analyseUserAgent($ua) {
 			}	
 			
 			
-			/****************************************************
-			 *		Opera
-			 */
-		
-			if (preg_match('/OPR\/([0-9.]*)/', $ua, $match)) {
-				$this->browser->stock = false;
-				$this->browser->channel = '';
-				$this->browser->name = 'Opera';
-				$this->browser->version = new Version(array('value' => $match[1], 'details' => 2));
-
-				if ($this->device->type == TYPE_MOBILE) {
-					$this->browser->name = 'Opera Mobile';
-				}
-			}
-
-			if (preg_match('/Opera/i', $ua)) {
-				$this->browser->stock = false;
-				$this->browser->name = 'Opera';
-
-				if (preg_match('/Opera[\/| ]([0-9.]*)/', $ua, $match)) {
-					$this->browser->version = new Version(array('value' => $match[1]));
-				}
-
-				if (preg_match('/Version\/([0-9.]*)/', $ua, $match)) {
-					if (floatval($match[1]) >= 10)
-						$this->browser->version = new Version(array('value' => $match[1]));
-					else
-						$this->browser->version = null;
-				}
-
-				if (!is_null($this->browser->version) && preg_match('/Edition Labs/', $ua)) {
-					$this->browser->channel = 'Labs';
-				}
-				
-				if (!is_null($this->browser->version) && preg_match('/Edition Next/', $ua)) {
-					$this->browser->channel = 'Next';
-				}
-				
-				if (preg_match('/Opera Tablet/', $ua)) {
-					$this->browser->name = 'Opera Mobile';
-					$this->device->type = TYPE_TABLET;
-				}
-				
-				if (preg_match('/Opera Mobi/', $ua)) {
-					$this->browser->name = 'Opera Mobile';
-					$this->device->type = TYPE_MOBILE;
-				}
-
-				if (preg_match('/Opera Mini;/', $ua)) {
-					$this->browser->name = 'Opera Mini';
-					$this->browser->version = null;
-					$this->browser->mode = 'proxy';
-					$this->device->type = TYPE_MOBILE;
-				}
-				
-				if (preg_match('/Opera Mini\/(?:att\/)?([0-9.]*)/', $ua, $match)) {
-					$this->browser->name = 'Opera Mini';
-					$this->browser->version = new Version(array('value' => $match[1], 'details' => (intval(substr(strrchr($match[1], '.'), 1)) > 99 ? -1 : null)));
-					$this->browser->mode = 'proxy';
-					$this->device->type = TYPE_MOBILE;
-				}
-				
-				if ($this->browser->name == 'Opera' && $this->device->type == TYPE_MOBILE) {
-					$this->browser->name = 'Opera Mobile';
-					
-					if (preg_match('/BER/', $ua)) {
-						$this->browser->name = 'Opera Mini';
-						$this->browser->version = null;
-					}
-				}
-
-				if (preg_match('/InettvBrowser/', $ua)) {
-					$this->device->type = TYPE_TELEVISION;
-				}
-
-				if (preg_match('/Opera[ -]TV/', $ua)) {
-					$this->browser->name = 'Opera';
-					$this->device->type = TYPE_TELEVISION;
-				}
-
-				if (preg_match('/Linux zbov/', $ua)) {
-					$this->browser->name = 'Opera Mobile';
-					$this->browser->mode = 'desktop';
-
-					$this->device->type = TYPE_MOBILE;
-
-					$this->os->name = null;
-					$this->os->version = null;
-				}
-
-				if (preg_match('/Linux zvav/', $ua)) {
-					$this->browser->name = 'Opera Mini';
-					$this->browser->version = null;
-					$this->browser->mode = 'desktop';
-
-					$this->device->type = TYPE_MOBILE;
-
-					$this->os->name = null;
-					$this->os->version = null;
-				}
-				
-				if ($this->device->type == '') {
-					$this->device->type = TYPE_DESKTOP;
-				}
-			}
-
 			/****************************************************
 			 *		wOSBrowser
 			 */
@@ -6402,8 +5444,6 @@ function analyseUserAgent($ua) {
 			if (preg_match('/UCWEB/', $ua)) {
 				$this->browser->stock = false;
 				$this->browser->name = 'UC Browser';
-
-				unset($this->browser->channel);
 				
 				if (preg_match('/UCWEB\/?([0-9]*[.][0-9]*)/', $ua, $match)) {
 					$this->browser->version = new Version(array('value' => $match[1], 'details' => 3));
@@ -6433,8 +5473,6 @@ function analyseUserAgent($ua) {
 			if (preg_match('/ucweb-squid/', $ua)) {
 				$this->browser->stock = false;
 				$this->browser->name = 'UC Browser';
-
-				unset($this->browser->channel);
 			}
 
 			if (preg_match('/\) UC /', $ua)) {
@@ -6460,8 +5498,6 @@ function analyseUserAgent($ua) {
 				$this->browser->name = 'UC Browser';
 				$this->browser->version = new Version(array('value' => $match[1], 'details' => 2));
 
-				unset($this->browser->channel);
-
 				if (!$this->device->type) {
 					$this->device->type = TYPE_MOBILE;
 				}
@@ -6558,7 +5594,6 @@ function analyseUserAgent($ua) {
 			if (preg_match('/Puffin\/([0-9.]*)/', $ua, $match)) {
 				$this->browser->name = 'Puffin';
 				$this->browser->version = new Version(array('value' => $match[1], 'details' => 2));
-				$this->browser->mode = 'proxy';
 				$this->browser->channel = '';
 				
 				$this->device->type = TYPE_MOBILE;
@@ -6610,8 +5645,7 @@ function analyseUserAgent($ua) {
 		
 			if (preg_match('/Maxthon[\/\' ]([0-9.]*)/', $ua, $match)) {
 				$this->browser->name = 'Maxthon';
-				$this->browser->version = new Version(array('value' => $match[1], 'details' => 3));
-				$this->browser->channel = '';
+				$this->browser->version = new Version(array('value' => $match[1], 'details' => 2));
 				
 				if ($this->os->name == 'Windows' && $this->browser->version->toFloat() < 4) {
 					$this->browser->version->details = 1;
@@ -6641,6 +5675,7 @@ function analyseUserAgent($ua) {
 				array('name' => 'UWebKit',				'regexp' => '/UWebKit\/([0-9.]*)/'),
 				
 				array('name' => 'PhantomJS',			'regexp' => '/PhantomJS\/([0-9.]*)/'),
+				array('name' => 'Google Web Preview',	'regexp' => '/Google Web Preview/'),
 				
 				array('name' => 'Google Earth',			'regexp' => '/Google Earth\/([0-9.]*)/'),
 				array('name' => 'EA Origin',			'regexp' => '/Origin\/([0-9.]*)/'),
@@ -6648,8 +5683,7 @@ function analyseUserAgent($ua) {
 				array('name' => 'Valve Steam',			'regexp' => '/Valve Steam/'),
 				
 				array('name' => 'Songbird',				'regexp' => '/Songbird\/([0-9.]*)/'),
-				array('name' => 'Thunderbird',			'regexp' => '/Thunderbird[\/ ]([0-9.]*)/', 'type' => TYPE_DESKTOP),
-				array('name' => 'Microsoft Outlook',	'regexp' => '/Microsoft Outlook IMO, Build ([0-9.]*)/', 'details' => 2, 'type' => TYPE_DESKTOP),
+				array('name' => 'Thunderbird',			'regexp' => '/Thunderbird\/([0-9.]*)/', 'type' => TYPE_DESKTOP),
 				
 				array('name' => '360 Extreme Explorer',	'regexp' => '/QIHU 360EE/', 'type' => TYPE_DESKTOP),
 				array('name' => '360 Safe Explorer',	'regexp' => '/QIHU 360SE/', 'type' => TYPE_DESKTOP),
@@ -6657,7 +5691,6 @@ function analyseUserAgent($ua) {
 				array('name' => '360 Phone Browser',	'regexp' => '/360 Aphone Browser \(Version ([0-9.]*)\)/'),
 				array('name' => 'ABrowse',				'regexp' => '/A[Bb]rowse ([0-9.]*)/'),
 				array('name' => 'Abrowser',				'regexp' => '/Abrowser\/([0-9.]*)/'),
-				array('name' => 'AltiBrowser',			'regexp' => '/AltiBrowser\/([0-9.]*)/i'),
 				array('name' => 'arora',				'regexp' => '/[Aa]rora\/([0-9.]*)/'),
 				array('name' => 'Avant Browser',		'regexp' => '/Avant TriCore/'),
 				array('name' => 'Baidu Browser',		'regexp' => '/M?BaiduBrowser\/([0-9.]*)/i'),
@@ -6694,12 +5727,10 @@ function analyseUserAgent($ua) {
 				array('name' => 'Jumanji', 				'regexp' => '/jumanji/'),
 				array('name' => 'Kazehakase', 			'regexp' => '/Kazehakase\/([0-9.]*)/'),
 				array('name' => 'KChrome', 				'regexp' => '/KChrome\/([0-9.]*)/', 'details' => 3),
-				array('name' => 'Kiosk', 				'regexp' => '/Kiosk\/([0-9.]*)/'),
 				array('name' => 'K-Meleon', 			'regexp' => '/K-Meleon\/([0-9.]*)/', 'type' => TYPE_DESKTOP),
 				array('name' => 'Leechcraft', 			'regexp' => '/Leechcraft(?:\/([0-9.]*))?/', 'details' => 2),
 				array('name' => 'Lightning', 			'regexp' => '/Lightning\/([0-9.]*)/'),
 				array('name' => 'Lunascape', 			'regexp' => '/Lunascape[\/| ]([0-9.]*)/', 'details' => 3),
-				array('name' => 'Lynx', 				'regexp' => '/Lynx\/([0-9.]*)/'),
 				array('name' => 'iLunascape', 			'regexp' => '/iLunascape\/([0-9.]*)/', 'details' => 3),
 				array('name' => 'Intermec Browser', 	'regexp' => '/Intermec\/([0-9.]*)/', 'details' => 2),
 				array('name' => 'MaCross Mobile', 		'regexp' => '/MaCross\/([0-9.]*)/'),
@@ -6707,12 +5738,12 @@ function analyseUserAgent($ua) {
 				array('name' => 'MixShark', 			'regexp' => '/MixShark\/([0-9.]*)/'),
 				array('name' => 'Motorola WebKit', 		'regexp' => '/MotorolaWebKit(?:\/([0-9.]*))?/', 'details' => 3),
 				array('name' => 'NetFront LifeBrowser', 'regexp' => '/NetFrontLifeBrowser\/([0-9.]*)/'),
-				array('name' => 'NetPositive', 			'regexp' => '/NetPositive\/([0-9.]*)/'),
 				array('name' => 'Netscape Navigator', 	'regexp' => '/Navigator\/([0-9.]*)/', 'details' => 3),
 				array('name' => 'Odyssey', 				'regexp' => '/OWB\/([0-9.]*)/'),
 				array('name' => 'OmniWeb', 				'regexp' => '/OmniWeb/', 'type' => TYPE_DESKTOP),
 				array('name' => 'OneBrowser', 			'regexp' => '/OneBrowser\/([0-9.]*)/'),
 				array('name' => 'Orca', 				'regexp' => '/Orca\/([0-9.]*)/'),
+				array('name' => 'Open Sankoré', 		'regexp' => '/Open-Sankore\/([0-9.]*)/'),
 				array('name' => 'Origyn', 				'regexp' => '/Origyn Web Browser/'),
 				array('name' => 'Palemoon', 			'regexp' => '/Pale[mM]oon\/([0-9.]*)/'),
 				array('name' => 'Phantom', 				'regexp' => '/Phantom\/V([0-9.]*)/'),
@@ -6725,7 +5756,7 @@ function analyseUserAgent($ua) {
 				array('name' => 'QupZilla', 			'regexp' => '/QupZilla\/([0-9.]*)/', 'type' => TYPE_DESKTOP),
 				array('name' => 'Roccat', 				'regexp' => '/Roccat\/([0-9]\.[0-9.]*)/'),
 				array('name' => 'Raven for Mac', 		'regexp' => '/Raven for Mac\/([0-9.]*)/'),
-				array('name' => 'rekonq', 				'regexp' => '/rekonq(?:\/([0-9.]*))?/', 'type' => TYPE_DESKTOP),
+				array('name' => 'rekonq', 				'regexp' => '/rekonq/', 'type' => TYPE_DESKTOP),
 				array('name' => 'RockMelt', 			'regexp' => '/RockMelt\/([0-9.]*)/', 'details' => 2),
 				array('name' => 'Sleipnir', 			'regexp' => '/Sleipnir\/([0-9.]*)/', 'details' => 3),
 				array('name' => 'SMBrowser', 			'regexp' => '/SMBrowser/'),
@@ -6745,27 +5776,10 @@ function analyseUserAgent($ua) {
 				array('name' => 'Wavelink Velocity',	'regexp' => '/Wavelink Velocity Browser\/([0-9.]*)/', 'details' => 2),
 				array('name' => 'WebPositive', 			'regexp' => '/WebPositive/'),
 				array('name' => 'WebRender', 			'regexp' => '/WebRender/'),
-				array('name' => 'Webster', 				'regexp' => '/Webster ([0-9.]*)/'),
 				array('name' => 'Wyzo', 				'regexp' => '/Wyzo\/([0-9.]*)/', 'details' => 3),
 				array('name' => 'Yandex Browser', 		'regexp' => '/YaBrowser\/([0-9.]*)/', 'details' => 2),
-				array('name' => 'YRC Weblink', 			'regexp' => '/YRCWeblink\/([0-9.]*)/'),
 				array('name' => 'Zetakey', 				'regexp' => '/Zetakey Webkit\/([0-9.]*)/'),
-				array('name' => 'Zetakey', 				'regexp' => '/Zetakey\/([0-9.]*)/'),
-				
-				array('name' => 'McAfee Web Gateway', 	'regexp' => '/Webwasher\/([0-9.]*)/'),
-				
-				array('name' => 'Open Sankoré', 		'regexp' => '/Open-Sankore\/([0-9.]*)/', 'type' => TYPE_WHITEBOARD),
-				array('name' => 'Coship MMCP', 			'regexp' => '/Coship_MMCP_([0-9.]*)/', 'type' => TYPE_SIGNAGE),
-				
-				array('name' => '80legs', 				'regexp' => '/008\/([0-9.]*)/', 'type' => TYPE_BOT),
-				array('name' => 'Ask Jeeves', 			'regexp' => '/Ask Jeeves\/Teoma/', 'type' => TYPE_BOT),
-				array('name' => 'Baiduspider', 			'regexp' => '/Baiduspider\/([0-9.]*)/', 'type' => TYPE_BOT),
-				array('name' => 'Bloglines', 			'regexp' => '/Bloglines\/([0-9.]*)/', 'type' => TYPE_BOT),
-				array('name' => 'Googlebot', 			'regexp' => '/Googlebot\/([0-9.]*)/', 'type' => TYPE_BOT),
-				array('name' => 'Google Web Preview',	'regexp' => '/Google Web Preview/', 'type' => TYPE_BOT),
-				array('name' => 'Google Font Analysis', 'regexp' => '/Google-FontAnalysis\/([0-9.]*)/', 'type' => TYPE_BOT),
-				array('name' => 'HeartRails Capture', 	'regexp' => '/HeartRails_Capture\/([0-9.]*)/', 'type' => TYPE_BOT),
-				array('name' => 'Wget', 				'regexp' => '/Wget\/([0-9.]*)/', 'type' => TYPE_BOT)
+				array('name' => 'Zetakey', 				'regexp' => '/Zetakey\/([0-9.]*)/')
 			);
 
 			for ($b = 0; $b < count($browsers); $b++) {
@@ -6774,7 +5788,7 @@ function analyseUserAgent($ua) {
 					$this->browser->channel = '';
 					$this->browser->stock = false;
 
-					if (isset($match[1]) && $match[1]) {
+					if ($match[1]) {
 						$this->browser->version = new Version(array('value' => $match[1], 'details' => isset($browsers[$b]['details']) ? $browsers[$b]['details'] : null));
 					} else {
 						$this->browser->version = null;
@@ -6902,7 +5916,7 @@ function analyseUserAgent($ua) {
 			}
 				
 			
-			if (isset($this->browser->name) && $this->browser->name == 'Opera' && $this->device->type == TYPE_TELEVISION) {
+			if ($this->device->type == TYPE_TELEVISION && $this->browser->name == 'Opera') {
 				$this->browser->name = 'Opera Devices';
 				
 				if (preg_match('/Presto\/([0-9]+\.[0-9]+)/', $ua, $match)) {
@@ -6965,16 +5979,6 @@ function analyseUserAgent($ua) {
 				}
 			}
 			
-			
-			/* If we have a Mozilla browser and not engine or other browser name, it could be the original */
-			if (preg_match('/Mozilla/', $ua) && !isset($this->browser->name) && !isset($this->engine->name)) {
-				$this->browser->name = 'Netscape';
-
-				if (preg_match('/Mozilla\/([0-9.]*)/i', $ua, $match)) {
-					$this->browser->version = new Version(array('value' => $match[1]));
-				}
-			}
-			
 		}
 		
 		function toJavaScript() {

From b3f676533a5c9f8658ec701b9c15d5169e4b900a Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:22:14 +0200
Subject: [PATCH 125/174] Revert "Retrieve data from new table structure"

This reverts commit d4220bcad9db10b5e042a54215b89fb2cd28e0d3.
---
 backend/browser.php | 121 +++++++++++++++++---------------------------
 backend/feature.php |  37 +++++++-------
 backend/index.php   | 102 ++++++++-----------------------------
 backend/results.php |  27 +++++-----
 4 files changed, 96 insertions(+), 191 deletions(-)

diff --git a/backend/browser.php b/backend/browser.php
index 4228f77a..d1e7b31c 100644
--- a/backend/browser.php
+++ b/backend/browser.php
@@ -15,20 +15,18 @@
 			SELECT 
 				b.unique AS id, b.nickname, b.details, '" . $type . "' AS type
 			FROM 
-				browsers AS b
-				LEFT JOIN scores AS s ON (b.unique = s.id)
-				LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
+				browsers AS b, 
+				scores AS s 
 			WHERE 
+				b.unique = s.id AND
 				b.listed = 1 AND
 				FIND_IN_SET('" . $type . "',b.type) AND
 				s.version = '" . $version . "' AND
-				f.points != ''
+				s.points != ''
 			ORDER BY 
 				id, nickname
 		");
 		
-		echo mysql_error();
-		
 		while ($row = mysql_fetch_object($res)) {
 			$results[] = $row;
 		}
@@ -40,87 +38,62 @@
 		$show = explode('/', $_REQUEST['show']);
 	
 		if (isset($show[0])) {
-			if (preg_match("/^[0-9]+\_[a-f0-9]{4,4}$/", $show[0])) {
-				if ($row = getResultsForUniqueId($show[0])) {
-					$tpl->set('one', json_encode($row));
-				}
-			}
+			$res = mysql_query("
+				SELECT 
+					b.unique AS id, b.nickname, s.score, s.bonus, s.points, s.results 
+				FROM 
+					browsers AS b, 
+					scores AS s 
+				WHERE 
+					b.unique = s.id AND 
+					b.listed = 1 AND
+					s.version = '" . $version . "' AND
+					b.unique ='" . mysql_real_escape_string($show[0]) . "'
+			");
 			
-			else {
-				if ($row = getResultsForBrowser($show[0], $version)) {
-					$tpl->set('one', json_encode($row));
-				}
+			if ($row = mysql_fetch_object($res)) {
+				$tpl->set('one', json_encode($row));
 			}
 		}
 		
 		if (isset($show[1])) {
-			if (preg_match("/^[0-9]+\_[a-f0-9]{4,4}$/", $show[1])) {
-				if ($row = getResultsForUniqueId($show[1])) {
-					$tpl->set('two', json_encode($row));
-				}
-			}
+			$res = mysql_query("
+				SELECT 
+					b.unique AS id, b.nickname, s.score, s.bonus, s.points, s.results 
+				FROM 
+					browsers AS b, 
+					scores AS s 
+				WHERE 
+					b.unique = s.id AND 
+					b.listed = 1 AND
+					s.version = '" . $version . "' AND
+					b.unique ='" . mysql_real_escape_string($show[1]) . "'
+			");
 			
-			else {
-				if ($row = getResultsForBrowser($show[1], $version)) {
-					$tpl->set('two', json_encode($row));
-				}
+			if ($row = mysql_fetch_object($res)) {
+				$tpl->set('two', json_encode($row));
 			}
 		}
 			
 		if (isset($show[2])) {
-			if (preg_match("/^[0-9]+\_[a-f0-9]{4,4}$/", $show[2])) {
-				if ($row = getResultsForUniqueId($show[2])) {
-					$tpl->set('three', json_encode($row));
-				}
-			}
+			$res = mysql_query("
+				SELECT 
+					b.unique AS id, b.nickname, s.score, s.bonus, s.points, s.results 
+				FROM 
+					browsers AS b, 
+					scores AS s 
+				WHERE 
+					b.unique = s.id AND 
+					b.listed = 1 AND
+					s.version = '" . $version . "' AND
+					b.unique ='" . mysql_real_escape_string($show[2]) . "'
+			");
 			
-			else {
-				if ($row = getResultsForBrowser($show[2], $version)) {
-					$tpl->set('three', json_encode($row));
-				}
+			if ($row = mysql_fetch_object($res)) {
+				$tpl->set('three', json_encode($row));
 			}
 		}
 	}
 	
 	
-	echo $tpl->fetch();
-	
-		
-	function getResultsForBrowser($browser, $version) {
-		$res = mysql_query("
-			SELECT 
-				b.unique AS id, b.nickname, f.score, f.bonus, f.points, f.results 
-			FROM 
-				browsers AS b
-				LEFT JOIN scores AS s ON (b.unique = s.id)
-				LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
-			WHERE 
-				b.listed = 1 AND
-				s.version = '" . $version . "' AND
-				b.unique ='" . mysql_real_escape_string($browser) . "'
-		");
-		
-		if ($row = mysql_fetch_object($res)) {
-			return $row;
-		}		
-	}
-	
-
-
-	function getResultsForUniqueId($id) {
-		$res = mysql_query("
-			SELECT 
-				r.uniqueid AS id, 'Unique id' AS nickname, r.score, r.bonus, r.points, r.results, humanReadable, useragentHeader AS useragent, deviceWidth, deviceHeight 
-			FROM 
-				results AS r
-			WHERE 
-				r.uniqueid ='" . mysql_real_escape_string($id) . "'
-		");
-		
-		if ($row = mysql_fetch_object($res)) {
-			return $row;
-		}		
-	}
-	
-	
-	
\ No newline at end of file
+	echo $tpl->fetch();
\ No newline at end of file
diff --git a/backend/feature.php b/backend/feature.php
index 6de07917..3e27617f 100644
--- a/backend/feature.php
+++ b/backend/feature.php
@@ -15,21 +15,18 @@
 			SELECT 
 				b.unique AS id, CONCAT(b.unique,'-" . $type . "-',b.id) AS uid, b.nickname, b.details, '" . $type . "' AS type
 			FROM 
-				browsers AS b
-				LEFT JOIN scores AS s ON (b.unique = s.id)
-				LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
+				browsers AS b, 
+				scores AS s 
 			WHERE 
+				b.unique = s.id AND
 				b.listed = 1 AND
 				FIND_IN_SET('" . $type . "',b.type) AND
-				f.version = '" . $version . "' AND
-				f.points != ''
+				s.version = '" . $version . "' AND
+				s.points != ''
 			ORDER BY 
 				id, nickname
 		");
 		
-			echo mysql_error();
-			
-
 		while ($row = mysql_fetch_object($res)) {
 			$results[] = $row;
 		}
@@ -45,12 +42,12 @@
 			
 			$res = mysql_query("
 				SELECT 
-					IF(f.results LIKE '%" . mysql_real_escape_string($show[0]) . "=1%',1,0) AS supported, b.unique AS id, CONCAT(b.unique,'-',b.id) AS uid
+					IF(s.results LIKE '%" . mysql_real_escape_string($show[0]) . "=1%',1,0) AS supported, b.unique AS id, CONCAT(b.unique,'-',b.id) AS uid
 				FROM 
-					browsers AS b			
-					LEFT JOIN scores AS s ON (b.unique = s.id)
-					LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
+					browsers AS b, 
+					scores AS s 
 				WHERE 
+					b.unique = s.id AND 
 					b.listed = 1 AND
 					s.version = '" . $version . "'
 			");
@@ -70,12 +67,12 @@
 			
 			$res = mysql_query("
 				SELECT 
-					IF(f.results LIKE '%" . mysql_real_escape_string($show[1]) . "=1%',1,0) AS supported, b.unique AS id, CONCAT(b.unique,'-',b.id) AS uid 
+					IF(s.results LIKE '%" . mysql_real_escape_string($show[1]) . "=1%',1,0) AS supported, b.unique AS id, CONCAT(b.unique,'-',b.id) AS uid 
 				FROM 
-					browsers AS b 
-					LEFT JOIN scores AS s ON (b.unique = s.id)
-					LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
+					browsers AS b, 
+					scores AS s 
 				WHERE 
+					b.unique = s.id AND 
 					b.listed = 1 AND
 					s.version = '" . $version . "'
 			");
@@ -95,12 +92,12 @@
 			
 			$res = mysql_query("
 				SELECT 
-					IF(f.results LIKE '%" . mysql_real_escape_string($show[2]) . "=1%',1,0) AS supported, b.unique AS id, CONCAT(b.unique,'-',b.id) AS uid 
+					IF(s.results LIKE '%" . mysql_real_escape_string($show[2]) . "=1%',1,0) AS supported, b.unique AS id, CONCAT(b.unique,'-',b.id) AS uid 
 				FROM 
-					browsers AS b
-					LEFT JOIN scores AS s ON (b.unique = s.id)
-					LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
+					browsers AS b, 
+					scores AS s 
 				WHERE 
+					b.unique = s.id AND 
 					b.listed = 1 AND
 					s.version = '" . $version . "'
 			");
diff --git a/backend/index.php b/backend/index.php
index 6e39ce71..ec28ba7d 100644
--- a/backend/index.php
+++ b/backend/index.php
@@ -23,12 +23,12 @@
 			
 			$res = mysql_query("
 				SELECT 
-					IF(f.results LIKE '%" . mysql_real_escape_string($_REQUEST['id']) . "=1%',1,0) AS supported, b.unique AS id, CONCAT(b.unique,'-',b.id) AS uid
+					IF(s.results LIKE '%" . mysql_real_escape_string($_REQUEST['id']) . "=1%',1,0) AS supported, b.unique AS id, CONCAT(b.unique,'-',b.id) AS uid
 				FROM 
-					browsers AS b
-					LEFT JOIN scores AS s ON (b.unique = s.id)
-					LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
+					browsers AS b, 
+					scores AS s 
 				WHERE 
+					b.unique = s.id AND 
 					b.listed = 1 AND
 					s.version = '" . $version . "'
 			");
@@ -48,7 +48,7 @@
 			if (substr($_REQUEST['id'], 0, 7) == 'custom:') {
 				$res = mysql_query("
 					SELECT 
-						uniqueid AS id, 'Unique id'  AS nickname, score, bonus, points, results, humanReadable, useragentHeader AS useragent, deviceWidth, deviceHeight
+						'custom' AS id, 'Unique id'  AS nickname, score, bonus, points, results 
 					FROM 
 						results 
 					WHERE 
@@ -57,12 +57,12 @@
 			} else {
 				$res = mysql_query("
 					SELECT 
-						b.unique AS id, b.nickname, f.score, f.bonus, f.points, f.results 
+						b.unique AS id, b.nickname, s.score, s.bonus, s.points, s.results 
 					FROM 
-						browsers AS b 
-						LEFT JOIN scores AS s ON (b.unique = s.id)
-						LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
+						browsers AS b, 
+						scores AS s 
 					WHERE 
+						b.unique = s.id AND 
 						b.listed = 1 AND
 						s.version = '" . $version . "' AND
 						b.unique ='" . mysql_real_escape_string($_REQUEST['id']) . "'
@@ -79,26 +79,13 @@
 			$payload = json_decode($_REQUEST['payload']);
 			$headers = apache_request_headers();
 						
-			$filteredHeaders = '';
-
-			foreach($headers as $key => $value) {
-				if (!in_array(strtolower($key), array(
-					'accept', 'host', 'connection', 'dnt', 'user-agent', 'accept-encoding', 'accept-language', 
-					'accept-charset', 'referer', 'cookie', 'content-type', 'content-length', 'content-transfer-encoding', 
-					'origin', 'pragma', 'cache-control', 'via', 'clientip', 'x-bluecoat-via', 'x-piper-id',
-					'x-forwarded-for', 'x-teacup', 'x-saucer', 'isajaxrequest', 'keep-alive', 'max-forwards',
-					'xroxy-connection', 'client-ip', 'cookie2', 'x-via', 'x-imforwards', 'http-client-id',
-					'x-proxy-id', 'z-forwarded-for', 'expect', 'x-ip-address', 'x-rbt-optimized-by', 'qpr-loop',
-					'cuda_cliip', 'x-source-id', 'x-clickoncesupport'
-				))) {
-					$filteredHeaders .= $key . ": " . $value . "\n";
-				}
-			}
-			
-			if (!$readonly && intval($payload->version) >= 4) {
-				$useragentHeader = $_SERVER['HTTP_USER_AGENT'];
-				$useragentId = preg_replace("/(; ?)[a-z][a-z](?:-[a-zA-Z][a-zA-Z])?([;)])/", '$1xx$2', $useragentHeader);
+			$xWapProfile = isset($headers['x-wap-profile']) ? $headers['x-wap-profile'] : '';
+			$xDeviceStockUA = isset($headers['Device-Stock-UA']) ? $headers['Device-Stock-UA'] : '';
+			$xDeviceUserAgent = isset($headers['X-Device-User-Agent']) ? $headers['X-Device-User-Agent'] : '';
+			$xOriginalUserAgent = isset($headers['X-Original-User-Agent']) ? $headers['X-Original-User-Agent'] : '';
+			$xOperaMiniPhoneUA = isset($headers['X-OperaMini-Phone-UA']) ? $headers['X-OperaMini-Phone-UA'] : '';
 			
+			if (!$readonly) {
 				mysql_query('
 					INSERT INTO 
 						results
@@ -129,27 +116,17 @@
 						deviceHeight = "' . mysql_real_escape_string($payload->deviceHeight) . '",
 						deviceType = "' . mysql_real_escape_string($payload->deviceType) . '",
 						useragent = "' . mysql_real_escape_string($payload->useragent) . '",
-						useragentHeader = "' . mysql_real_escape_string($useragentHeader) . '",
-						useragentId = "' . mysql_real_escape_string(md5($useragentId)) . '",
 						humanReadable = "' . mysql_real_escape_string($payload->humanReadable) . '",
-						headers = "' . mysql_real_escape_string($filteredHeaders) . '",
+						xWapProfile = "' . mysql_real_escape_string($xWapProfile) . '",
+						xDeviceStockUA = "' . mysql_real_escape_string($xDeviceStockUA) . '",
+						xDeviceUserAgent = "' . mysql_real_escape_string($xDeviceUserAgent) . '",
+						xOriginalUserAgent = "' . mysql_real_escape_string($xOriginalUserAgent) . '",
+						xOperaMiniPhoneUA = "' . mysql_real_escape_string($xOperaMiniPhoneUA) . '",
 						results = "' . mysql_real_escape_string($payload->results) . '",
 						points = "' . mysql_real_escape_string($payload->points) . '",
 						fingerprint = "' . mysql_real_escape_string(md5($payload->results.$payload->points)) . '",
 						status = 0
 				');
-
-				mysql_query('
-					INSERT INTO 
-						fingerprints
-					SET 
-						fingerprint = "' . mysql_real_escape_string(md5($payload->results.$payload->points)) . '",
-						version = "' . mysql_real_escape_string($payload->version) . '",
-						score = "' . mysql_real_escape_string($payload->score) . '",
-						bonus = "' . mysql_real_escape_string($payload->bonus) . '",
-						results = "' . mysql_real_escape_string($payload->results) . '",
-						points = "' . mysql_real_escape_string($payload->points) . '"
-				');
 			}
 
 			break;
@@ -185,43 +162,4 @@
 			}
 
 			break;
-
-
-			
-		case 'uasimplify':
-			$res = mysql_query("
-				SELECT 
-					DISTINCT useragentHeader
-				FROM
-					results
-				WHERE
-					useragentId = ''
-			");
-
-			header ('Content-type: text/html');
-
-			echo "<table style='font-family: sans-serif' border=1>";
-			while ($row = mysql_fetch_object($res)) {
-				$ua = preg_replace("/(; ?)[a-z][a-z](?:-[a-zA-Z][a-zA-Z])?([;)])/", '$1xx$2', $row->useragentHeader);
-			
-				echo "<tr>";
-				echo "<td>" . $row->useragentHeader . "</td>";
-				echo "<td>" . $ua . "</td>";
-				echo "</tr>";
-				
-				mysql_query("
-					UPDATE
-						results
-					SET
-						useragentId = '" . md5($row->useragentId) . "' 
-					WHERE
-						useragentHeader = '" . $row->useragentHeader . "'
-				");
-
-			}
-
-			echo "</table>";
-
-		
-			break;
 	}
diff --git a/backend/results.php b/backend/results.php
index cee17a26..938d50fc 100644
--- a/backend/results.php
+++ b/backend/results.php
@@ -18,12 +18,12 @@
 
 	$res = mysql_query("
 		SELECT 
-			b.status, b.unique, b.nickname, b.details, b.description, f.score, f.bonus, f.points, f.results 
+			b.status, b.unique, b.nickname, b.details, b.description, s.score, s.bonus, s.points, s.results 
 		FROM 
-			browsers AS b
-			LEFT JOIN scores AS s ON (b.unique = s.id)
-			LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
+			browsers AS b, 
+			scores AS s 
 		WHERE 
+			b.unique = s.id AND 
 			b.listed = 1 AND
 			s.version = '" . $version . "' AND
 			FIND_IN_SET('" . $type . "',type)
@@ -37,9 +37,9 @@
 
 	
 	$tpl->set('results', $results);
-	if (isset($results['current']) && count($results['current']) > 0) $tpl->set('first', $results['current'][0]);
-	if (isset($results['current']) && count($results['current']) > 1) $tpl->set('runnerup', $results['current'][1]);
-	if (isset($results['development']) && count($results['development']) > 0) $tpl->set('upcoming', $results['development'][0]);
+	if (count($results['current']) > 0) $tpl->set('first', $results['current'][0]);
+	if (count($results['current']) > 1) $tpl->set('runnerup', $results['current'][1]);
+	if (count($results['development']) > 0) $tpl->set('upcoming', $results['development'][0]);
 	
 	
 	
@@ -48,22 +48,19 @@
 
 	$res = mysql_query("
 		SELECT 
-			b.grouped, b.unique, b.nickname, b.details, IF(ISNULL(b.release),DATE(NOW()),b.release) AS `release`, b.status, f.score
+			b.grouped, b.unique, b.nickname, b.details, IF(ISNULL(b.release),DATE(NOW()),b.release) AS `release`, b.status, s.score
 		FROM 
-			browsers AS b
-			LEFT JOIN scores AS s ON (b.unique = s.id)
-			LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
+			browsers AS b, 
+			scores AS s 
 		WHERE 
+			b.unique = s.id AND 
 			(!ISNULL(b.release) OR b.status = 'development') AND
 			s.version = '" . $version . "' AND
-			FIND_IN_SET('" . $type . "',type) AND
-			!ISNULL(f.score)
+			FIND_IN_SET('" . $type . "',type)
 		ORDER BY 
 			b.grouped, `release`
 	");
 	
-	echo mysql_error();
-	
 	while ($row = mysql_fetch_object($res)) {
 		$sets[$row->grouped]['name'] = $row->grouped;
 		$sets[$row->grouped]['data'][] = $row;

From ff72ee9a738afd3947118ae0c4a68417631a8f5d Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:26:34 +0200
Subject: [PATCH 126/174] Retrieve data from new table structure

---
 backend/browser.php            | 121 ++++++++++++++++++++-------------
 backend/feature.php            |  37 +++++-----
 backend/index.php              |  18 ++---
 backend/results.php            |  27 ++++----
 backend/templates/browser.html |   6 +-
 backend/templates/feature.html |   6 +-
 6 files changed, 124 insertions(+), 91 deletions(-)

diff --git a/backend/browser.php b/backend/browser.php
index d1e7b31c..4228f77a 100644
--- a/backend/browser.php
+++ b/backend/browser.php
@@ -15,18 +15,20 @@
 			SELECT 
 				b.unique AS id, b.nickname, b.details, '" . $type . "' AS type
 			FROM 
-				browsers AS b, 
-				scores AS s 
+				browsers AS b
+				LEFT JOIN scores AS s ON (b.unique = s.id)
+				LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
 			WHERE 
-				b.unique = s.id AND
 				b.listed = 1 AND
 				FIND_IN_SET('" . $type . "',b.type) AND
 				s.version = '" . $version . "' AND
-				s.points != ''
+				f.points != ''
 			ORDER BY 
 				id, nickname
 		");
 		
+		echo mysql_error();
+		
 		while ($row = mysql_fetch_object($res)) {
 			$results[] = $row;
 		}
@@ -38,62 +40,87 @@
 		$show = explode('/', $_REQUEST['show']);
 	
 		if (isset($show[0])) {
-			$res = mysql_query("
-				SELECT 
-					b.unique AS id, b.nickname, s.score, s.bonus, s.points, s.results 
-				FROM 
-					browsers AS b, 
-					scores AS s 
-				WHERE 
-					b.unique = s.id AND 
-					b.listed = 1 AND
-					s.version = '" . $version . "' AND
-					b.unique ='" . mysql_real_escape_string($show[0]) . "'
-			");
+			if (preg_match("/^[0-9]+\_[a-f0-9]{4,4}$/", $show[0])) {
+				if ($row = getResultsForUniqueId($show[0])) {
+					$tpl->set('one', json_encode($row));
+				}
+			}
 			
-			if ($row = mysql_fetch_object($res)) {
-				$tpl->set('one', json_encode($row));
+			else {
+				if ($row = getResultsForBrowser($show[0], $version)) {
+					$tpl->set('one', json_encode($row));
+				}
 			}
 		}
 		
 		if (isset($show[1])) {
-			$res = mysql_query("
-				SELECT 
-					b.unique AS id, b.nickname, s.score, s.bonus, s.points, s.results 
-				FROM 
-					browsers AS b, 
-					scores AS s 
-				WHERE 
-					b.unique = s.id AND 
-					b.listed = 1 AND
-					s.version = '" . $version . "' AND
-					b.unique ='" . mysql_real_escape_string($show[1]) . "'
-			");
+			if (preg_match("/^[0-9]+\_[a-f0-9]{4,4}$/", $show[1])) {
+				if ($row = getResultsForUniqueId($show[1])) {
+					$tpl->set('two', json_encode($row));
+				}
+			}
 			
-			if ($row = mysql_fetch_object($res)) {
-				$tpl->set('two', json_encode($row));
+			else {
+				if ($row = getResultsForBrowser($show[1], $version)) {
+					$tpl->set('two', json_encode($row));
+				}
 			}
 		}
 			
 		if (isset($show[2])) {
-			$res = mysql_query("
-				SELECT 
-					b.unique AS id, b.nickname, s.score, s.bonus, s.points, s.results 
-				FROM 
-					browsers AS b, 
-					scores AS s 
-				WHERE 
-					b.unique = s.id AND 
-					b.listed = 1 AND
-					s.version = '" . $version . "' AND
-					b.unique ='" . mysql_real_escape_string($show[2]) . "'
-			");
+			if (preg_match("/^[0-9]+\_[a-f0-9]{4,4}$/", $show[2])) {
+				if ($row = getResultsForUniqueId($show[2])) {
+					$tpl->set('three', json_encode($row));
+				}
+			}
 			
-			if ($row = mysql_fetch_object($res)) {
-				$tpl->set('three', json_encode($row));
+			else {
+				if ($row = getResultsForBrowser($show[2], $version)) {
+					$tpl->set('three', json_encode($row));
+				}
 			}
 		}
 	}
 	
 	
-	echo $tpl->fetch();
\ No newline at end of file
+	echo $tpl->fetch();
+	
+		
+	function getResultsForBrowser($browser, $version) {
+		$res = mysql_query("
+			SELECT 
+				b.unique AS id, b.nickname, f.score, f.bonus, f.points, f.results 
+			FROM 
+				browsers AS b
+				LEFT JOIN scores AS s ON (b.unique = s.id)
+				LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
+			WHERE 
+				b.listed = 1 AND
+				s.version = '" . $version . "' AND
+				b.unique ='" . mysql_real_escape_string($browser) . "'
+		");
+		
+		if ($row = mysql_fetch_object($res)) {
+			return $row;
+		}		
+	}
+	
+
+
+	function getResultsForUniqueId($id) {
+		$res = mysql_query("
+			SELECT 
+				r.uniqueid AS id, 'Unique id' AS nickname, r.score, r.bonus, r.points, r.results, humanReadable, useragentHeader AS useragent, deviceWidth, deviceHeight 
+			FROM 
+				results AS r
+			WHERE 
+				r.uniqueid ='" . mysql_real_escape_string($id) . "'
+		");
+		
+		if ($row = mysql_fetch_object($res)) {
+			return $row;
+		}		
+	}
+	
+	
+	
\ No newline at end of file
diff --git a/backend/feature.php b/backend/feature.php
index 3e27617f..6de07917 100644
--- a/backend/feature.php
+++ b/backend/feature.php
@@ -15,18 +15,21 @@
 			SELECT 
 				b.unique AS id, CONCAT(b.unique,'-" . $type . "-',b.id) AS uid, b.nickname, b.details, '" . $type . "' AS type
 			FROM 
-				browsers AS b, 
-				scores AS s 
+				browsers AS b
+				LEFT JOIN scores AS s ON (b.unique = s.id)
+				LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
 			WHERE 
-				b.unique = s.id AND
 				b.listed = 1 AND
 				FIND_IN_SET('" . $type . "',b.type) AND
-				s.version = '" . $version . "' AND
-				s.points != ''
+				f.version = '" . $version . "' AND
+				f.points != ''
 			ORDER BY 
 				id, nickname
 		");
 		
+			echo mysql_error();
+			
+
 		while ($row = mysql_fetch_object($res)) {
 			$results[] = $row;
 		}
@@ -42,12 +45,12 @@
 			
 			$res = mysql_query("
 				SELECT 
-					IF(s.results LIKE '%" . mysql_real_escape_string($show[0]) . "=1%',1,0) AS supported, b.unique AS id, CONCAT(b.unique,'-',b.id) AS uid
+					IF(f.results LIKE '%" . mysql_real_escape_string($show[0]) . "=1%',1,0) AS supported, b.unique AS id, CONCAT(b.unique,'-',b.id) AS uid
 				FROM 
-					browsers AS b, 
-					scores AS s 
+					browsers AS b			
+					LEFT JOIN scores AS s ON (b.unique = s.id)
+					LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
 				WHERE 
-					b.unique = s.id AND 
 					b.listed = 1 AND
 					s.version = '" . $version . "'
 			");
@@ -67,12 +70,12 @@
 			
 			$res = mysql_query("
 				SELECT 
-					IF(s.results LIKE '%" . mysql_real_escape_string($show[1]) . "=1%',1,0) AS supported, b.unique AS id, CONCAT(b.unique,'-',b.id) AS uid 
+					IF(f.results LIKE '%" . mysql_real_escape_string($show[1]) . "=1%',1,0) AS supported, b.unique AS id, CONCAT(b.unique,'-',b.id) AS uid 
 				FROM 
-					browsers AS b, 
-					scores AS s 
+					browsers AS b 
+					LEFT JOIN scores AS s ON (b.unique = s.id)
+					LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
 				WHERE 
-					b.unique = s.id AND 
 					b.listed = 1 AND
 					s.version = '" . $version . "'
 			");
@@ -92,12 +95,12 @@
 			
 			$res = mysql_query("
 				SELECT 
-					IF(s.results LIKE '%" . mysql_real_escape_string($show[2]) . "=1%',1,0) AS supported, b.unique AS id, CONCAT(b.unique,'-',b.id) AS uid 
+					IF(f.results LIKE '%" . mysql_real_escape_string($show[2]) . "=1%',1,0) AS supported, b.unique AS id, CONCAT(b.unique,'-',b.id) AS uid 
 				FROM 
-					browsers AS b, 
-					scores AS s 
+					browsers AS b
+					LEFT JOIN scores AS s ON (b.unique = s.id)
+					LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
 				WHERE 
-					b.unique = s.id AND 
 					b.listed = 1 AND
 					s.version = '" . $version . "'
 			");
diff --git a/backend/index.php b/backend/index.php
index ec28ba7d..bc2141de 100644
--- a/backend/index.php
+++ b/backend/index.php
@@ -23,12 +23,12 @@
 			
 			$res = mysql_query("
 				SELECT 
-					IF(s.results LIKE '%" . mysql_real_escape_string($_REQUEST['id']) . "=1%',1,0) AS supported, b.unique AS id, CONCAT(b.unique,'-',b.id) AS uid
+					IF(f.results LIKE '%" . mysql_real_escape_string($_REQUEST['id']) . "=1%',1,0) AS supported, b.unique AS id, CONCAT(b.unique,'-',b.id) AS uid
 				FROM 
-					browsers AS b, 
-					scores AS s 
+					browsers AS b
+					LEFT JOIN scores AS s ON (b.unique = s.id)
+					LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
 				WHERE 
-					b.unique = s.id AND 
 					b.listed = 1 AND
 					s.version = '" . $version . "'
 			");
@@ -48,7 +48,7 @@
 			if (substr($_REQUEST['id'], 0, 7) == 'custom:') {
 				$res = mysql_query("
 					SELECT 
-						'custom' AS id, 'Unique id'  AS nickname, score, bonus, points, results 
+						uniqueid AS id, 'Unique id'  AS nickname, score, bonus, points, results, humanReadable, useragentHeader AS useragent, deviceWidth, deviceHeight
 					FROM 
 						results 
 					WHERE 
@@ -57,12 +57,12 @@
 			} else {
 				$res = mysql_query("
 					SELECT 
-						b.unique AS id, b.nickname, s.score, s.bonus, s.points, s.results 
+						b.unique AS id, b.nickname, f.score, f.bonus, f.points, f.results 
 					FROM 
-						browsers AS b, 
-						scores AS s 
+						browsers AS b 
+						LEFT JOIN scores AS s ON (b.unique = s.id)
+						LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
 					WHERE 
-						b.unique = s.id AND 
 						b.listed = 1 AND
 						s.version = '" . $version . "' AND
 						b.unique ='" . mysql_real_escape_string($_REQUEST['id']) . "'
diff --git a/backend/results.php b/backend/results.php
index 938d50fc..cee17a26 100644
--- a/backend/results.php
+++ b/backend/results.php
@@ -18,12 +18,12 @@
 
 	$res = mysql_query("
 		SELECT 
-			b.status, b.unique, b.nickname, b.details, b.description, s.score, s.bonus, s.points, s.results 
+			b.status, b.unique, b.nickname, b.details, b.description, f.score, f.bonus, f.points, f.results 
 		FROM 
-			browsers AS b, 
-			scores AS s 
+			browsers AS b
+			LEFT JOIN scores AS s ON (b.unique = s.id)
+			LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
 		WHERE 
-			b.unique = s.id AND 
 			b.listed = 1 AND
 			s.version = '" . $version . "' AND
 			FIND_IN_SET('" . $type . "',type)
@@ -37,9 +37,9 @@
 
 	
 	$tpl->set('results', $results);
-	if (count($results['current']) > 0) $tpl->set('first', $results['current'][0]);
-	if (count($results['current']) > 1) $tpl->set('runnerup', $results['current'][1]);
-	if (count($results['development']) > 0) $tpl->set('upcoming', $results['development'][0]);
+	if (isset($results['current']) && count($results['current']) > 0) $tpl->set('first', $results['current'][0]);
+	if (isset($results['current']) && count($results['current']) > 1) $tpl->set('runnerup', $results['current'][1]);
+	if (isset($results['development']) && count($results['development']) > 0) $tpl->set('upcoming', $results['development'][0]);
 	
 	
 	
@@ -48,19 +48,22 @@
 
 	$res = mysql_query("
 		SELECT 
-			b.grouped, b.unique, b.nickname, b.details, IF(ISNULL(b.release),DATE(NOW()),b.release) AS `release`, b.status, s.score
+			b.grouped, b.unique, b.nickname, b.details, IF(ISNULL(b.release),DATE(NOW()),b.release) AS `release`, b.status, f.score
 		FROM 
-			browsers AS b, 
-			scores AS s 
+			browsers AS b
+			LEFT JOIN scores AS s ON (b.unique = s.id)
+			LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
 		WHERE 
-			b.unique = s.id AND 
 			(!ISNULL(b.release) OR b.status = 'development') AND
 			s.version = '" . $version . "' AND
-			FIND_IN_SET('" . $type . "',type)
+			FIND_IN_SET('" . $type . "',type) AND
+			!ISNULL(f.score)
 		ORDER BY 
 			b.grouped, `release`
 	");
 	
+	echo mysql_error();
+	
 	while ($row = mysql_fetch_object($res)) {
 		$sets[$row->grouped]['name'] = $row->grouped;
 		$sets[$row->grouped]['data'][] = $row;
diff --git a/backend/templates/browser.html b/backend/templates/browser.html
index e6675f27..821f20bd 100644
--- a/backend/templates/browser.html
+++ b/backend/templates/browser.html
@@ -90,15 +90,15 @@ <h3 data-i18n>About these scores</h3>
 										}	
 					});
 					
-				<?php if ($one != ''): ?> 
+				<?php if (isset($one) && $one != ''): ?> 
 					table.updateColumn(0, <?php echo $one; ?>);
 				<?php endif; ?>
 				
-				<?php if ($two != ''): ?> 
+				<?php if (isset($two) && $two != ''): ?> 
 					table.updateColumn(1, <?php echo $two; ?>);
 				<?php endif; ?>
 				
-				<?php if ($three != ''): ?> 
+				<?php if (isset($three) && $three != ''): ?> 
 					table.updateColumn(2, <?php echo $three; ?>);
 				<?php endif; ?>
 				
diff --git a/backend/templates/feature.html b/backend/templates/feature.html
index fdfdfeef..a91c7800 100644
--- a/backend/templates/feature.html
+++ b/backend/templates/feature.html
@@ -82,15 +82,15 @@ <h3 data-i18n>About these scores</h3>
 										}	
 					});
 					
-				<?php if ($one != ''): ?> 
+				<?php if (isset($one) && $one != ''): ?> 
 					table.updateColumn(0, <?php echo $one; ?>);
 				<?php endif; ?>
 				
-				<?php if ($two != ''): ?> 
+				<?php if (isset($two) && $two != ''): ?> 
 					table.updateColumn(1, <?php echo $two; ?>);
 				<?php endif; ?>
 				
-				<?php if ($three != ''): ?> 
+				<?php if (isset($three) && $three != ''): ?> 
 					table.updateColumn(2, <?php echo $three; ?>);
 				<?php endif; ?>
 										

From 339bdfffc753870d55e842aa992167fcf64edc2d Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:28:20 +0200
Subject: [PATCH 127/174] Use one field for all headers instead of specific
 fields for a limited number of headers

---
 backend/index.php | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/backend/index.php b/backend/index.php
index bc2141de..954f35e9 100644
--- a/backend/index.php
+++ b/backend/index.php
@@ -79,11 +79,21 @@
 			$payload = json_decode($_REQUEST['payload']);
 			$headers = apache_request_headers();
 						
-			$xWapProfile = isset($headers['x-wap-profile']) ? $headers['x-wap-profile'] : '';
-			$xDeviceStockUA = isset($headers['Device-Stock-UA']) ? $headers['Device-Stock-UA'] : '';
-			$xDeviceUserAgent = isset($headers['X-Device-User-Agent']) ? $headers['X-Device-User-Agent'] : '';
-			$xOriginalUserAgent = isset($headers['X-Original-User-Agent']) ? $headers['X-Original-User-Agent'] : '';
-			$xOperaMiniPhoneUA = isset($headers['X-OperaMini-Phone-UA']) ? $headers['X-OperaMini-Phone-UA'] : '';
+			$filteredHeaders = '';
+
+			foreach($headers as $key => $value) {
+				if (!in_array(strtolower($key), array(
+					'accept', 'host', 'connection', 'dnt', 'user-agent', 'accept-encoding', 'accept-language', 
+					'accept-charset', 'referer', 'cookie', 'content-type', 'content-length', 'content-transfer-encoding', 
+					'origin', 'pragma', 'cache-control', 'via', 'clientip', 'x-bluecoat-via', 'x-piper-id',
+					'x-forwarded-for', 'x-teacup', 'x-saucer', 'isajaxrequest', 'keep-alive', 'max-forwards',
+					'xroxy-connection', 'client-ip', 'cookie2', 'x-via', 'x-imforwards', 'http-client-id',
+					'x-proxy-id', 'z-forwarded-for', 'expect', 'x-ip-address', 'x-rbt-optimized-by', 'qpr-loop',
+					'cuda_cliip', 'x-source-id', 'x-clickoncesupport'
+				))) {
+					$filteredHeaders .= $key . ": " . $value . "\n";
+				}
+			}
 			
 			if (!$readonly) {
 				mysql_query('
@@ -117,11 +127,7 @@
 						deviceType = "' . mysql_real_escape_string($payload->deviceType) . '",
 						useragent = "' . mysql_real_escape_string($payload->useragent) . '",
 						humanReadable = "' . mysql_real_escape_string($payload->humanReadable) . '",
-						xWapProfile = "' . mysql_real_escape_string($xWapProfile) . '",
-						xDeviceStockUA = "' . mysql_real_escape_string($xDeviceStockUA) . '",
-						xDeviceUserAgent = "' . mysql_real_escape_string($xDeviceUserAgent) . '",
-						xOriginalUserAgent = "' . mysql_real_escape_string($xOriginalUserAgent) . '",
-						xOperaMiniPhoneUA = "' . mysql_real_escape_string($xOperaMiniPhoneUA) . '",
+						headers = "' . mysql_real_escape_string($filteredHeaders) . '",
 						results = "' . mysql_real_escape_string($payload->results) . '",
 						points = "' . mysql_real_escape_string($payload->points) . '",
 						fingerprint = "' . mysql_real_escape_string(md5($payload->results.$payload->points)) . '",

From 4b7ed37103b50e446b934574b8659465c8eca204 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:29:08 +0200
Subject: [PATCH 128/174] Calculate a useragentId based on a delocalized
 useragent

---
 backend/index.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/backend/index.php b/backend/index.php
index 954f35e9..6807005e 100644
--- a/backend/index.php
+++ b/backend/index.php
@@ -95,7 +95,10 @@
 				}
 			}
 			
-			if (!$readonly) {
+			if (!$readonly && intval($payload->version) >= 4) {
+				$useragentHeader = $_SERVER['HTTP_USER_AGENT'];
+				$useragentId = preg_replace("/(; ?)[a-z][a-z](?:-[a-zA-Z][a-zA-Z])?([;)])/", '$1xx$2', $useragentHeader);
+			
 				mysql_query('
 					INSERT INTO 
 						results
@@ -126,6 +129,8 @@
 						deviceHeight = "' . mysql_real_escape_string($payload->deviceHeight) . '",
 						deviceType = "' . mysql_real_escape_string($payload->deviceType) . '",
 						useragent = "' . mysql_real_escape_string($payload->useragent) . '",
+						useragentHeader = "' . mysql_real_escape_string($useragentHeader) . '",
+						useragentId = "' . mysql_real_escape_string(md5($useragentId)) . '",
 						humanReadable = "' . mysql_real_escape_string($payload->humanReadable) . '",
 						headers = "' . mysql_real_escape_string($filteredHeaders) . '",
 						results = "' . mysql_real_escape_string($payload->results) . '",

From c36b7ddd4fc7e804820a7c67ce0443b8c49cca96 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:29:34 +0200
Subject: [PATCH 129/174] Store data in a separate fingerprint table

---
 backend/index.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/backend/index.php b/backend/index.php
index 6807005e..545d7fc9 100644
--- a/backend/index.php
+++ b/backend/index.php
@@ -138,6 +138,18 @@
 						fingerprint = "' . mysql_real_escape_string(md5($payload->results.$payload->points)) . '",
 						status = 0
 				');
+
+				mysql_query('
+					INSERT INTO 
+						fingerprints
+					SET 
+						fingerprint = "' . mysql_real_escape_string(md5($payload->results.$payload->points)) . '",
+						version = "' . mysql_real_escape_string($payload->version) . '",
+						score = "' . mysql_real_escape_string($payload->score) . '",
+						bonus = "' . mysql_real_escape_string($payload->bonus) . '",
+						results = "' . mysql_real_escape_string($payload->results) . '",
+						points = "' . mysql_real_escape_string($payload->points) . '"
+				');
 			}
 
 			break;

From 544e0b086736f672a712dd4baae8c53cb059c4cb Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:31:02 +0200
Subject: [PATCH 130/174] Escape { and } because it caused problems on S60
 WebKit

---
 scripts/template.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/template.js b/scripts/template.js
index 5af8219e..bf4d6033 100644
--- a/scripts/template.js
+++ b/scripts/template.js
@@ -35,8 +35,8 @@
 
 
 var tim = (function(){
-    var starts  = "{{",
-        ends    = "}}",
+    var starts  = "\\{\\{",
+        ends    = "\\}\\}",
         path    = "[a-z0-9_][\\.a-z0-9_]*", // e.g. config.person.name
         pattern = new RegExp(starts + "("+ path +")" + ends, "gim"),
         undef;

From 543db13ac7fe9bcb0be0cde92689368082fadb0c Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:31:32 +0200
Subject: [PATCH 131/174] Also use revision in version comparisons

---
 scripts/useragents/detect.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/useragents/detect.js b/scripts/useragents/detect.js
index 354cab21..720a5e3f 100644
--- a/scripts/useragents/detect.js
+++ b/scripts/useragents/detect.js
@@ -71,7 +71,7 @@ var UserAgents = (function(){
 		},
 		
 		valueOf: function() {
-			return parseFloat('' + this.major + '.' + ('0000' + this.minor).slice(-4));
+			return parseFloat('' + this.major + '.' + ('0000' + this.minor).slice(-4) + ('0000' + this.revision).slice(-4));
 		},
 		
 		toString: function() {

From f8598daf0b087edf7095a767d08ee4ab6433da4f Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:33:00 +0200
Subject: [PATCH 132/174] If we encounter a cloaked UC Browser, reset version

---
 scripts/useragents/detect.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/useragents/detect.js b/scripts/useragents/detect.js
index 720a5e3f..1cdd56f0 100644
--- a/scripts/useragents/detect.js
+++ b/scripts/useragents/detect.js
@@ -160,6 +160,7 @@ var UserAgents = (function(){
 			if (ua == 'Mozilla/5.0 (X11; U; Linux i686; zh-CN; rv:1.2.3.4) Gecko/') {
 				if (this.browser.name != 'UC Browser') {
 					this.browser.name = 'UC Browser';
+					this.browser.version = null;
 					this.engine.name = 'Gecko';
 				}
 				

From d833a181e169daf1c670ff440c0fc5eff668a7f6 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:33:25 +0200
Subject: [PATCH 133/174] If we encounter a cloaked UC Browser that claim to be
 running on Windows, reset OS

---
 scripts/useragents/detect.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/useragents/detect.js b/scripts/useragents/detect.js
index 1cdd56f0..7afe9671 100644
--- a/scripts/useragents/detect.js
+++ b/scripts/useragents/detect.js
@@ -164,6 +164,11 @@ var UserAgents = (function(){
 					this.engine.name = 'Gecko';
 				}
 				
+				if (this.os.name == 'Windows') {
+					this.os.name = '';
+					this.os.version = null;
+				}
+				
 				this.engine.name = 'Gecko';
 				this.engine.version = null;
 				

From 25d5c0de5b9e04206c89f3ed6aa9a388b54cd74a Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:34:41 +0200
Subject: [PATCH 134/174] Do not check for features if we are using a proxy
 browser, because we might get unexpected results because the engine is not
 running on the actual device

---
 scripts/useragents/detect.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/useragents/detect.js b/scripts/useragents/detect.js
index 7afe9671..6c581a5b 100644
--- a/scripts/useragents/detect.js
+++ b/scripts/useragents/detect.js
@@ -230,7 +230,7 @@ var UserAgents = (function(){
 				}
 
 
-				if (this.options.useFeatures) {
+				if (this.options.useFeatures && this.browser.mode != 'proxy') {
 					/* If it claims not to be Trident, but it is probably Trident running camouflage mode */
 					if (window.ActiveXObject) {
 						this.features.push('trident');		

From b14e5ff2b0405f655a56e2163f28691064414e43 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:35:00 +0200
Subject: [PATCH 135/174] Whitespace changes

---
 scripts/useragents/detect.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/useragents/detect.js b/scripts/useragents/detect.js
index 6c581a5b..0853188e 100644
--- a/scripts/useragents/detect.js
+++ b/scripts/useragents/detect.js
@@ -106,6 +106,7 @@ var UserAgents = (function(){
 			return version;
 		}
 	}
+	
 
  	var Detected = function() { this.initialize.apply(this, arguments) };
 	Detected.prototype = {
@@ -291,7 +292,6 @@ var UserAgents = (function(){
 					}
 	
 	
-	
 					/* If we have an iPad that is not 768 x 1024, we have an imposter */
 					if (this.device.model == 'iPad') {
 						if ((screen.width != 0 && screen.height != 0) && (screen.width != 768 && screen.height != 1024) && (screen.width != 1024 && screen.height != 768)) {
@@ -421,6 +421,5 @@ var UserAgents = (function(){
 		}
 	};
 
-
 	return Detected;
 })();	

From b316143a123cf82678f920e202d98f30f0dce3dd Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:35:15 +0200
Subject: [PATCH 136/174] Add new device types

---
 scripts/useragents/useragents.lib.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/useragents/useragents.lib.php b/scripts/useragents/useragents.lib.php
index 5969a520..2ad308d2 100644
--- a/scripts/useragents/useragents.lib.php
+++ b/scripts/useragents/useragents.lib.php
@@ -34,7 +34,11 @@
 	define ('TYPE_EMULATOR', 'emulator');
 	define ('TYPE_TELEVISION', 'television');
 	define ('TYPE_CAMERA', 'camera');
+	define ('TYPE_SIGNAGE', 'signage');
+	define ('TYPE_WHITEBOARD', 'whiteboard');
+	define ('TYPE_CAR', 'car');
 	define ('TYPE_POS', 'pos');
+	define ('TYPE_BOT', 'bot');
 
 	define ('FLAG_GOOGLETV', 1);
 

From ca338c74925c74379803393f908d6ede5cbdc6f8 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:37:09 +0200
Subject: [PATCH 137/174] Analyse browser based on X-Requested-With header

---
 scripts/useragents/useragents.lib.php | 111 ++++++++++++++++++++++++++
 1 file changed, 111 insertions(+)

diff --git a/scripts/useragents/useragents.lib.php b/scripts/useragents/useragents.lib.php
index 2ad308d2..ff779686 100644
--- a/scripts/useragents/useragents.lib.php
+++ b/scripts/useragents/useragents.lib.php
@@ -43,6 +43,86 @@
 	define ('FLAG_GOOGLETV', 1);
 
 	
+	class BrowserIds {
+		static $ANDROID_BROWSERS = array(
+//			com.android.browser
+//			com.google.android.browser
+
+			'com.qihoo.browser'									=> '360 Phone Browser',
+			'net.adgjm.angel'									=> 'Angel Browser',
+			'com.apc.browser'									=> 'APC',
+			'com.baidu.browser.apps'							=> 'Baidu Browser',
+			'com.baidu.browser.inter'							=> 'Baidu Browser',
+			'com.baidu.searchbox'								=> 'Baidu Browser',
+			'com.boatbrowser.free'								=> 'Boat Browser',
+			'com.boatgo.browser'								=> 'Boat Browser Mini',
+			'com.ericsson.research.mario'						=> 'Bowser',
+			'mobi.mgeek.TunnyBrowser'							=> 'Dolphin',
+			'com.dolphin.browser.android.jp'					=> 'Dolphin',
+			'com.dolphin.browser.pad'							=> 'Dolphin',
+			'com.dolphin.browser.lab.cn'						=> 'Dolphin Beta',
+			'com.dolphin.browser.lab.en'						=> 'Dolphin Beta',
+			'com.dolphin.browser.cn'							=> 'Dolphin Mini',
+			'com.dolphin.browser.en'							=> 'Dolphin Mini',
+			'easy.browser.classic'								=> 'Easy Browser',
+			'easy.browser.com'									=> 'Easy Browser',
+			'it.blogspot.fedeveloper'							=> 'Emergency Browser',	
+			'gpc.myweb.hinet.net.PopupWeb'						=> 'Floating Browser Flux',
+			'galaxy.browser.gb.free'							=> 'Galaxy Browser',
+			'galaxy.browser.gb.pro'								=> 'Galaxy Browser',
+			'jp.ddo.pigsty.Habit_Browser'						=> 'Habit Browser',
+			'com.adsi.kioware.client.mobile.app'				=> 'KioWare Kiosk',
+			'com.vng.android.zingbrowser'						=> 'Laban',
+			'acr.browser.barebones'								=> 'Lightning Browser',
+			'com.mx.browser'									=> 'Maxthon',
+			'com.mx.browser.tablet'								=> 'Maxthon',
+			'com.fevdev.nakedbrowser'							=> 'Naked Browser',
+			'com.nhn.android.search'							=> 'Naver',
+			'com.access_company.android.nflifebrowser.lite'		=> 'NetFront LifeBrowser',
+			'com.ninesky.browser'								=> 'Ninesky',
+			'com.compal.android.browser'						=> 'Ocean Browser',
+			'com.tencent.ibibo.mtt'								=> 'One Browser',
+			'info.guardianproject.browser'						=> 'Orweb',	
+			'com.appsverse.photon'								=> 'Photon Browser',
+			'com.tencent.international.mtt'						=> 'QQ Browser',
+			'com.tencent.mobileqq'								=> 'QQ Browser',
+			'com.tencent.padbrowser'							=> 'QQ Browser',
+			'com.skyfire.consumer.browser'						=> 'Skyfire',
+			'jp.co.fenrir.android.sleipnir'						=> 'Sleipnir',
+			'jp.co.fenrir.android.sleipnir_test'				=> 'Sleipnir',
+			'com.mns.android.swing'								=> 'Swing Browser',
+			'org.tint'											=> 'Tint Browser',
+			'com.UCMobile'										=> 'UC Browser',
+			'com.UCMobile.intl'									=> 'UC Browser',
+			'com.uc.browser.hd'									=> 'UC Browser',
+			'com.uc.browser.en'									=> 'UC Browser Mini',
+			'sui.mRelease'										=> 'xScope Browser Pro',
+			'org.zirco'											=> 'Zirco Browser',
+			
+			'com.jv.falcon.pro'									=> 'Falcon Pro',
+			'com.noinnion.android.greader.readerpro'			=> 'gReader Pro',
+			'com.levelup.touiteur'								=> 'Plume',
+			'com.andrewshu.android.redditdonation'				=> 'Reddit is fun',
+			'com.sina.weibo'									=> 'Sina Weibo'
+		);
+
+		function identify($type, $model) {
+			switch($type) {
+				case 'android':		return BrowserIds::identifyList(BrowserIds::$ANDROID_BROWSERS, $model);
+			}
+
+			return false;
+		}
+		
+		function identifyList($list, $id) {
+			if (isset($list[$id])) {
+				return $list[$id];
+			}
+			
+			return false;
+		}
+	}
+	
 	class DeviceModels {
 		static $ANDROID_MODELS = array(
 			/* Generic identifiers */
@@ -2844,6 +2924,37 @@ function __construct($headers) {
 			if (isset($this->headers['X-Original-User-Agent'])) $this->analyseAlternativeUserAgent($this->headers['X-Original-User-Agent']);
 			if (isset($this->headers['X-Device-User-Agent'])) $this->analyseAlternativeUserAgent($this->headers['X-Device-User-Agent']);
 			if (isset($this->headers['Device-Stock-UA'])) $this->analyseAlternativeUserAgent($this->headers['Device-Stock-UA']);
+
+			if (isset($this->headers['X-Requested-With'])) $this->analyseBrowserId($this->headers['X-Requested-With']);
+		}
+		
+		function analyseBrowserId($id) {
+			$browser = BrowserIds::identify('android', $id);
+			if ($browser) {
+				if (!isset($this->browser->name) || $this->browser->name != $browser) {
+					$this->browser->name = $browser;
+					$this->browser->version = null;
+					$this->browser->stock = false;
+				}
+			}
+
+			if ($this->os->name != 'Android' && $this->os->name != 'Aliyun OS') {
+				$this->os->name = 'Android';
+				$this->os->version = null;
+				
+				$this->device->manufacturer = null;
+				$this->device->model = null;
+				$this->device->identified = false;
+				
+				if ($this->device->type != TYPE_MOBILE && $this->device->type != TYPE_TABLET) {
+					$this->device->type = TYPE_MOBILE;
+				}
+			}
+			
+			if ($this->engine->name != 'Webkit') {
+				$this->engine->name = 'Webkit';
+				$this->engine->version = null;
+			}
 		}
 		
 		function analyseAlternativeUserAgent($ua) {

From 2f8ff03a8f8d9fc95f8383e6c9b76aa48a975340 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:49:41 +0200
Subject: [PATCH 138/174] Many new devices for the device database

---
 scripts/useragents/useragents.lib.php | 981 ++++++++++++++++++++++----
 1 file changed, 848 insertions(+), 133 deletions(-)

diff --git a/scripts/useragents/useragents.lib.php b/scripts/useragents/useragents.lib.php
index ff779686..f9df98ec 100644
--- a/scripts/useragents/useragents.lib.php
+++ b/scripts/useragents/useragents.lib.php
@@ -137,6 +137,7 @@ class DeviceModels {
 			'Amlogic M1 reference board'				=> array( 'Amlogic', 'M1 reference board' ),
 			'AML8726M'									=> array( 'Amlogic', 'AML8726-M based device' ),
 			'vexpress a9'								=> array( 'ARM', 'Versatile Express development platform' ),
+			'sama5d3'									=> array( 'Atmel', 'SAMA5D3 based device' ),
 			'bcm7231'									=> array( 'Broadcom', 'BCM7231 based device', TYPE_TELEVISION ),
 			'bcm7425'									=> array( 'Broadcom', 'BCM7425 based device', TYPE_TELEVISION ),
 			'bcm7429'									=> array( 'Broadcom', 'BCM7429 based device', TYPE_TELEVISION ),
@@ -144,8 +145,12 @@ class DeviceModels {
 			'imx51!'									=> array( 'Freescale', 'i.MX51 based device' ),
 			'imx53!'									=> array( 'Freescale', 'i.MX53 based device' ),
 			'imx6q!'									=> array( 'Freescale', 'i.MX6Q based device' ),
+			'SABRESD-MX6DQ'								=> array( 'Freescale', 'i.MX6DQ based device' ),
 			'ODROID-A'									=> array( 'Hardkernel', 'ODROID-A developer tablet', TYPE_TABLET ),
+			'ODROID-U2'									=> array( 'Hardkernel', 'ODROID-U2 developer board' ),
 			'mfld (dv10|dv20|lw00|pr2|pr3)!'			=> array( 'Intel', 'Medfield based device' ),
+			'redhookbay'								=> array( 'Intel', 'Merrifield based device' ),
+			'Shark Bay Client platform'					=> array( 'Intel', 'Haswell based device' ),
 			'berlin bg2'								=> array( 'Marvell', 'Armada 1000 based device', TYPE_TELEVISION ),
 			'MStar Amber3'								=> array( 'MStar', 'Amber3 based device' ),
 			'Konka Amber3'								=> array( 'MStar', 'Amber3 based device' ),
@@ -153,6 +158,7 @@ class DeviceModels {
 			'bird75v2'									=> array( 'Mediatek', 'MT6575 based device' ),
 			'eagle75v1 2'								=> array( 'Mediatek', 'MT6575 based device' ),
 			'mt6575!'									=> array( 'Mediatek', 'MT6575 based device' ),		
+			'mt6589!'									=> array( 'Mediatek', 'MT6589 based device' ),		
 			'mt8658'									=> array( 'Mediatek', 'MT8658 based device' ),
 			'MBX DVBT reference board (c03ref)'			=> array( 'MXB', 'DVBT reference board', TYPE_TELEVISION ),
 			'NS115' 									=> array( 'Nufront', 'NuSmart 115 based device' ),
@@ -190,6 +196,7 @@ class DeviceModels {
 			'LogicPD Zoom2'								=> array( 'Texas Instruments', 'OMAP based device' ),
 			'omap3evm'									=> array( 'Texas Instruments', 'OMAP3 based device' ),
 			'Omap5sevm'									=> array( 'Texas Instruments', 'OMAP5 based device' ),
+			'AM335XEVM SK'								=> array( 'Texas Instruments', 'Sitara AM335 based device' ),
 			'pnx8473 kiryung'							=> array( 'Trident', 'PNX8473 based device', TYPE_TELEVISION ),
 			
 			/* Official Google development devices */
@@ -215,7 +222,7 @@ class DeviceModels {
 			'Galaxy Nexus'								=> array( 'Samsung', 'Galaxy Nexus' ),
 			'Grouper'									=> array( 'Asus', 'Nexus 7', TYPE_TABLET ),
 			'(Google )?Nexus 7!'						=> array( 'Asus', 'Nexus 7', TYPE_TABLET ),
-			'Nexus 4'									=> array( 'LG', 'Nexus 4' ),
+			'(Google )?Nexus 4!'						=> array( 'LG', 'Nexus 4' ),
 			'manta'										=> array( 'Samsung', 'Nexus 10', TYPE_TABLET ),
 			'Nexus 10'									=> array( 'Samsung', 'Nexus 10', TYPE_TABLET ),
 
@@ -224,10 +231,31 @@ class DeviceModels {
 			'BlueStacks'								=> array( 'BlueStacks', 'App Player', 'desktop' ),
 			'youwave custom'							=> array( 'Youwave', 'Android on PC', 'desktop' ),
 			'BlackBerry Runtime for Android Apps'		=> array( 'RIM', 'BlackBerry (Android Runtime)', TYPE_MOBILE ),
+			'BlackBerry Runtime for Android Apps'		=> array( 'RIM', 'BlackBerry (Android Runtime)', TYPE_MOBILE ),
+			'full Android on Microsoft Windows, pad, pc, n*books'	
+														=> array( 'SocketeQ', 'WindowsAndroid', 'desktop' ),
+
+			/* TV sticks */
+			'MK808'										=> array( null, 'MK808', TYPE_TELEVISION ),
+			'MK808B'									=> array( null, 'MK808B', TYPE_TELEVISION ),
+			'GK802'										=> array( null, 'GK802', TYPE_TELEVISION ),
+			'VEOLO'										=> array( 'A.C. Ryan', 'VEOLO Smart Android Hub', TYPE_TELEVISION ),
+			'M3 Enjoy TV Box'							=> array( 'Geniatech', 'Enjoy TV', TYPE_TELEVISION ),
+			'Rikomagic MK802'							=> array( 'Rikomagic', 'MK802', TYPE_TELEVISION ),
+			'Rikomagic MK802II'							=> array( 'Rikomagic', 'MK802 II', TYPE_TELEVISION ),
+			'Rikomagic MK802III'						=> array( 'Rikomagic', 'MK802 III', TYPE_TELEVISION ),	
+			'Rikomagic MK802IIIS'						=> array( 'Rikomagic', 'MK802 IIIS', TYPE_TELEVISION ),	
+			'XW-I8'										=> array( 'Sambao', 'XW-I8', TYPE_TELEVISION ),
+			'TCC8925 HDMI DONGLE'						=> array( 'Telechips', 'TCC8925', TYPE_TELEVISION ),
+			'TCC8930 STB EV'							=> array( 'Telechips', 'TCC8930', TYPE_TELEVISION ),
+
 			
 			/* Regular devices */
+			'BC9710A'									=> array( '3Q', 'Qoo! Q-Pad BC9710A', TYPE_TABLET ),
 			'RC0710B'									=> array( '3Q', 'Qoo! Q-Pad RC0710B', TYPE_TABLET ),
+			'QS9718C'									=> array( '3Q', 'Qoo! Q-Pad QS9718C', TYPE_TABLET ),
 			'TS1009B'									=> array( '3Q', 'Qoo! Surf Tablet TS1009B', TYPE_TABLET ),
+			'VM0711A'									=> array( '3Q', 'Qoo! Surf Tablet VM0711A', TYPE_TABLET ),
 			'aspire1000s'								=> array( 'Acer', '1000 Series', TYPE_DESKTOP ),
 			'A100'										=> array( 'Acer', 'Iconia Tab A100', TYPE_TABLET ),
 			'A101'										=> array( 'Acer', 'Iconia Tab A101', TYPE_TABLET ),
@@ -243,6 +271,7 @@ class DeviceModels {
 			'P2A700'									=> array( 'Acer', 'Iconia Tab A700', TYPE_TABLET ),
 			'A701'										=> array( 'Acer', 'Iconia Tab A701', TYPE_TABLET ),
 			'A800'										=> array( 'Acer', 'Iconia Tab A800', TYPE_TABLET ),
+			'B1-A71'									=> array( 'Acer', 'Iconia B1-A71', TYPE_TABLET ),
 			'E110'										=> array( 'Acer', 'beTouch E110' ),
 			'E120'										=> array( 'Acer', 'beTouch E120' ),
 			'E130'										=> array( 'Acer', 'beTouch E130' ),
@@ -267,40 +296,77 @@ class DeviceModels {
 			'Liquid Metal'								=> array( 'Acer', 'Liquid mt' ),
 			'Stream'									=> array( 'Acer', 'Stream' ),
 			'AK330s'									=> array( 'Acer', 'AK330s' ),
+			'T1-B'										=> array( 'Advan', 'Vandroid T1-B', TYPE_TABLET ),
+			'VegaBean!'									=> array( 'Advent', 'Vega', TYPE_TABLET ),
 			'N700'										=> array( 'aigo', 'N700', TYPE_TABLET ),
 			'M801'										=> array( 'aigo', 'M801', TYPE_TABLET ),
 			'Novo7'										=> array( 'Ainovo', 'Novo7', TYPE_TABLET ),
 			'Novo7 Aurora'								=> array( 'Ainovo', 'Novo7 Aurora', TYPE_TABLET ),
+			'Ainovo Aurora-II'							=> array( 'Ainovo', 'Novo7 Aurora II', TYPE_TABLET ),
+			'Aurora-II'									=> array( 'Ainovo', 'Novo7 Aurora II', TYPE_TABLET ),
 			'Novo7 Advanced'							=> array( 'Ainovo', 'Novo7 Advanced', TYPE_TABLET ),
 			'Novo7 Advanced2'							=> array( 'Ainovo', 'Novo7 Advanced 2', TYPE_TABLET ),
 			'Novo7 Basic'								=> array( 'Ainovo', 'Novo7 Basic', TYPE_TABLET ),
+			'NovoCrystal'								=> array( 'Ainovo', 'Novo7 Crystal', TYPE_TABLET ),
 			'Novo7 ELF'									=> array( 'Ainovo', 'Novo7 Elf', TYPE_TABLET ),
+			'ELF-II'									=> array( 'Ainovo', 'Novo7 Elf II', TYPE_TABLET ),
 			'Novo7 Fire'								=> array( 'Ainovo', 'Novo7 Fire', TYPE_TABLET ),
 			'Novo7 Flame'								=> array( 'Ainovo', 'Novo7 Flame', TYPE_TABLET ),
 			'Ainovo Flame (Nexus 7)'					=> array( 'Ainovo', 'Novo7 Flame', TYPE_TABLET ),
+			'Novo7 Legend'								=> array( 'Ainovo', 'Novo7 Legend', TYPE_TABLET ),
 			'Novo7 PALADIN'								=> array( 'Ainovo', 'Novo7 Paladin', TYPE_TABLET ),
+			'Novo7 Venus'								=> array( 'Ainovo', 'Novo7 Venus', TYPE_TABLET ),
 			'Novo8 Advanced'							=> array( 'Ainovo', 'Novo8 Advanced', TYPE_TABLET ),
+			'novo9-Spark'								=> array( 'Ainovo', 'Novo9 Spark', TYPE_TABLET ),
 			'Novo10 Hero'								=> array( 'Ainovo', 'Novo10 Hero', TYPE_TABLET ),
+			'Novo 10 Hero QuadCore'						=> array( 'Ainovo', 'Novo10 Hero', TYPE_TABLET ),
 			'one touch 890!'							=> array( 'Alcatel', 'One Touch 890' ),
 			'one touch 891!'							=> array( 'Alcatel', 'One Touch 891' ),
 			'one touch 903!'							=> array( 'Alcatel', 'One Touch 903' ),
 			'one touch 906!'							=> array( 'Alcatel', 'One Touch 906' ),
 			'one touch 908!'							=> array( 'Alcatel', 'One Touch 908' ),
+			'one touch 909!'							=> array( 'Alcatel', 'One Touch 909' ),
 			'one touch 910!'							=> array( 'Alcatel', 'One Touch 910' ),
+			'one touch 916!'							=> array( 'Alcatel', 'One Touch 916' ),
 			'one touch 918!'							=> array( 'Alcatel', 'One Touch 918' ),
+			'one touch 927!'							=> array( 'Alcatel', 'One Touch 927' ),
+			'one touch 928!'							=> array( 'Alcatel', 'One Touch 928' ),
+			'one touch 930!'							=> array( 'Alcatel', 'One Touch 930' ),
 			'one touch 979!'							=> array( 'Alcatel', 'One Touch 979' ),
 			'one touch 980!'							=> array( 'Alcatel', 'One Touch 980' ),
 			'one touch 981!'							=> array( 'Alcatel', 'One Touch 981' ),
+			'one touch 983!'							=> array( 'Alcatel', 'One Touch 983' ),
 			'one touch 985!'							=> array( 'Alcatel', 'One Touch 985' ),
 			'one touch 986!'							=> array( 'Alcatel', 'One Touch 986' ),
 			'one touch 990!'							=> array( 'Alcatel', 'One Touch 990' ),
 			'one touch 991!'							=> array( 'Alcatel', 'One Touch 991' ),
+			'one touch 992!'							=> array( 'Alcatel', 'One Touch 992' ),
 			'one touch 993!'							=> array( 'Alcatel', 'One Touch 993' ),
 			'one touch 995!'							=> array( 'Alcatel', 'One Touch 995' ),
 			'one touch 997!'							=> array( 'Alcatel', 'One Touch 997' ),
-			'Telenor OneTouch'							=> array( 'Alcatel', 'One Touch 990' ),
 			'OT 918'									=> array( 'Alcatel', 'One Touch 918' ),
+			'OT-995'									=> array( 'Alcatel', 'One Touch 995' ),
+			'one touch 4010X'							=> array( 'Alcatel', 'One Touch 4010X' ),
+			'one touch 4030D'							=> array( 'Alcatel', 'One Touch 4030D' ),
+			'one touch 4030E'							=> array( 'Alcatel', 'One Touch 4030E' ),
+			'one touch 5020A'							=> array( 'Alcatel', 'One Touch 5020A' ),
+			'one touch 5020W'							=> array( 'Alcatel', 'One Touch 5020W' ),
+			'one touch 5020X'							=> array( 'Alcatel', 'One Touch 5020X' ),
+			'one touch 5035A'							=> array( 'Alcatel', 'One Touch 5035A' ),
+			'one touch 6010X'							=> array( 'Alcatel', 'One Touch 6010X' ),
+			'one touch 6030A'							=> array( 'Alcatel', 'One Touch 6030A' ),
+			'one touch 6030X'							=> array( 'Alcatel', 'One Touch 6030X' ),
+			'one touch 6033X'							=> array( 'Alcatel', 'One Touch 6033X' ),
+			'one touch 7025D'							=> array( 'Alcatel', 'One Touch 7025D' ),
+			'one touch 7025X'							=> array( 'Alcatel', 'One Touch 7025X' ),
+			'one touch 7030L'							=> array( 'Alcatel', 'One Touch 7030L' ),
+			'one touch 7030R'							=> array( 'Alcatel', 'One Touch 7030R' ),
+			'one touch T10'								=> array( 'Alcatel', 'One Touch T10', TYPE_TABLET ),
+			'onetouch EVO7'								=> array( 'Alcatel', 'One Touch Evo 7', TYPE_TABLET ),
 			'Venture'									=> array( 'Alcatel', 'Venture' ),
+			'ALLVIEW P4i'								=> array( 'Allview', 'P4 Duo' ),
+			'Allview P5-Mini'							=> array( 'Allview', 'P5 Mini' ),
+			'A10'										=> array( 'AllWinner', 'A10', TYPE_TABLET ),
 			'Allwinner A10'								=> array( 'AllWinner', 'A10', TYPE_TABLET ),
 			'97FC'										=> array( 'AllWinner', 'A10 97FC', TYPE_TABLET ),
 			'A13-?MID!'									=> array( 'AllWinner', 'A13', TYPE_TABLET ),
@@ -309,24 +375,42 @@ class DeviceModels {
 			'KFOT'										=> array( 'Amazon', 'Kindle Fire', TYPE_TABLET ),	
 			'KFTT'										=> array( 'Amazon', 'Kindle Fire HD 7"', TYPE_TABLET ),
 			'KFJW(I|A)!'								=> array( 'Amazon', 'Kindle Fire HD 8.9"', TYPE_TABLET ),
+			'AMOI N79+'									=> array( 'Amoi', 'N79' ),
 			'AMOI N89'									=> array( 'Amoi', 'N89' ),
+			'AMOI N808'									=> array( 'Amoi', 'N808' ),
+			'AMOI N816'									=> array( 'Amoi', 'N816' ),
 			'AMOI N820'									=> array( 'Amoi', 'N820' ),
 			'AMOI N821'									=> array( 'Amoi', 'N821' ),
+			'AMOI N828'									=> array( 'Amoi', 'N828' ),
+			'AMOI N850'									=> array( 'Amoi', 'N850' ),
+			'AMOI M8228'								=> array( 'Amoi', 'M8228' ),
 			'AMD120'									=> array( 'AnyDATA', 'AnyTAB AMD120', TYPE_TABLET ),
+			'mw07'										=> array( 'AOC', 'Breeze MW07', TYPE_TABLET ),
 			'MW0711'									=> array( 'AOC', 'Breeze MW0711', TYPE_TABLET ),
 			'MW0811'									=> array( 'AOC', 'Breeze MW0811', TYPE_TABLET ),
+			'MW0812'									=> array( 'AOC', 'Breeze MW0812', TYPE_TABLET ),
 			'MW0821 V2.0'								=> array( 'AOC', 'Breeze MW0821', TYPE_TABLET ),
 			'MW0922'									=> array( 'AOC', 'Breeze MW0922', TYPE_TABLET ),
 			'AOLE 828'									=> array( 'Aole', '828' ),
+			'M19'										=> array( 'Aoson', 'M19', TYPE_TABLET ),
+			'Aoson M19'									=> array( 'Aoson', 'M19', TYPE_TABLET ),
 			'Apanda.A60!'								=> array( 'Apanda', 'A60' ),
 			'apanda-A80S'								=> array( 'Apanda', 'A80' ),
 			'Quicki-811'								=> array( 'Apollo', 'Quicki-811', TYPE_TABLET ),
-			'A80KSC!'									=> array( 'Archos', 'Arnova 8', TYPE_TABLET ),
-			'AN7CG2'									=> array( 'Archos', 'Arnova 7', TYPE_TABLET ),
+			'AN7CG2'									=> array( 'Archos', 'Arnova 7c G2', TYPE_TABLET ),
 			'AN7G3'										=> array( 'Archos', 'Arnova 7 G3', TYPE_TABLET ),
+			'AN7DG3-CP'									=> array( 'Archos', 'Arnova 7d G3', TYPE_TABLET ),
+			'AN7FG3'									=> array( 'Archos', 'Arnova 7f G3', TYPE_TABLET ),
+			'AN7HG3'									=> array( 'Archos', 'Arnova 7h G3', TYPE_TABLET ),
+			'A80KSC!'									=> array( 'Archos', 'Arnova 8', TYPE_TABLET ),
+			'AN8G3'										=> array( 'Archos', 'Arnova 8 G3', TYPE_TABLET ),
+			'AN9G2'										=> array( 'Archos', 'Arnova 9 G2', TYPE_TABLET ),
 			'A101B'										=> array( 'Archos', 'Arnova 10', TYPE_TABLET ),
-			'AN10BG2DT'									=> array( 'Archos', 'Arnova 10 B', TYPE_TABLET ),
 			'AN10G2'									=> array( 'Archos', 'Arnova 10 G2', TYPE_TABLET ),
+			'AN10BG2DT'									=> array( 'Archos', 'Arnova 10b G2', TYPE_TABLET ),
+			'AN10BG3'									=> array( 'Archos', 'Arnova 10b G3', TYPE_TABLET ),
+			'AN10CG3'									=> array( 'Archos', 'Arnova 10c G3', TYPE_TABLET ),
+			'AN10DG3'									=> array( 'Archos', 'Arnova 10d G3', TYPE_TABLET ),
 			'A32'										=> array( 'Archos', '32', 'media' ),
 			'A35DE'										=> array( 'Archos', '35 Smart Home Phone' ),
 			'A43'										=> array( 'Archos', '43', 'media' ),
@@ -342,14 +426,19 @@ class DeviceModels {
 			'ARCHOS 80G9'								=> array( 'Archos', '80 G9', TYPE_TABLET ),							// G9
 			'ARCHOS 101G9'								=> array( 'Archos', '101 G9', TYPE_TABLET ),						
 			'ARCHOS 97XSLG10'							=> array( 'Archos', '97 XS', TYPE_TABLET ),							// G10
+			'ARCHOS 80XSK'								=> array( 'Archos', '80 XS', TYPE_TABLET ),							// G10
 			'ARCHOS 101G10'								=> array( 'Archos', '101 XS', TYPE_TABLET ),
 			'ARCHOS 80 COBALT'							=> array( 'Archos', '80 Cobalt', TYPE_TABLET ),						// Elements
+			'ARCHOS 80 TITANIUM'						=> array( 'Archos', '80 Titanium', TYPE_TABLET ),					// Elements
 			'ARCHOS 97 CARBON'							=> array( 'Archos', '97 Carbon', TYPE_TABLET ),						// Elements
+			'ARCHOS 97 TITANIUMHD'						=> array( 'Archos', '97 Titanium HD', TYPE_TABLET ),				// Elements
+			'ARCHOS GAMEPAD'							=> array( 'Archos', 'Gamepad', TYPE_GAMING ),
 			'D9702'										=> array( 'Artes', 'D9702', TYPE_TABLET ),
 			'ASTRI'										=> array( 'ASTRI', 'e-reader', TYPE_EREADER ),
 			'eeepc'										=> array( 'Asus', 'Eee Pc' ),
 			'asus laptop'								=> array( 'Asus', 'Eee Pc' ),
 			'ME171'										=> array( 'Asus', 'Eee Pad MeMO', TYPE_TABLET ),
+			'ME172V'									=> array( 'Asus', 'MemoPad ME172V', TYPE_TABLET ),
 			'Slider SL101'								=> array( 'Asus', 'Eee Pad Slider', TYPE_TABLET ),
 			'EPAD'										=> array( 'Asus', 'Eee Pad Transformer', TYPE_TABLET ),
 			'TF101'										=> array( 'Asus', 'Eee Pad Transformer', TYPE_TABLET ),
@@ -360,12 +449,20 @@ class DeviceModels {
 			'Transformer Prime'							=> array( 'Asus', 'Eee Pad Transformer Prime', TYPE_TABLET ),
 			'(Transformer )?(Pad )?TF300(T|TG|TL)!'		=> array( 'Asus', 'Transformer Pad 300', TYPE_TABLET ),
 			'(Transformer )?(Pad )?TF700(T|K)!'			=> array( 'Asus', 'Transformer Pad Infinity 700', TYPE_TABLET ),
+			'Transformer Infinity'						=> array( 'Asus', 'Transformer Pad Infinity 700', TYPE_TABLET ),
+			'ME301T'									=> array( 'Asus', 'MemoPad ME301T', TYPE_TABLET ),
+			'ME371MG'									=> array( 'Asus', 'Fonepad K004', TYPE_TABLET ),
 			'PadFone'									=> array( 'Asus', 'Padfone', TYPE_TABLET ),
 			'PadFone 2'									=> array( 'Asus', 'Padfone 2', TYPE_TABLET ),
+			'PadFone Infinity'							=> array( 'Asus', 'Padfone Infinity', TYPE_TABLET ),
 			'OMS TTD'									=> array( 'Asus', 'Eee Pc T10' ),
 			'ASUS T20'									=> array( 'Asus', 'Eee Pc T20' ),
 			'ETBW11AA'									=> array( 'Asus', 'Tough' ),
+			'T-07B'										=> array( 'AudioSonic', 'T07B', TYPE_TABLET ),
 			'AUX V900'									=> array( 'AUX', 'V900' ),
+			'PICOpad GEW'								=> array( 'Axioo', 'Picopad GEW', TYPE_TABLET ),
+			'Axioo PICOpad GIM'							=> array( 'Axioo', 'Picopad GIM', TYPE_TABLET ),
+			'PICOpad GJT'								=> array( 'Axioo', 'Picopad GJT', TYPE_TABLET ),
 			'PICOpad-QGN'								=> array( 'Axioo', 'Picopad QGN', TYPE_TABLET ),
 			'A10 MID'									=> array( 'Azhuo', 'A10 MID', TYPE_TABLET ),
 			'NOOK'										=> array( 'Barnes & Noble', 'NOOK', TYPE_EREADER ),
@@ -378,17 +475,33 @@ class DeviceModels {
 			'(NOOK )?BNRV350!'							=> array( 'Barnes & Noble', 'NOOK Simple Touch', TYPE_EREADER ),
 			'(NOOK )?BNTV(400)!'						=> array( 'Barnes & Noble', 'NOOK HD Tablet', TYPE_EREADER ),
 			'(NOOK )?BNTV(600)!'						=> array( 'Barnes & Noble', 'NOOK HD+ Tablet', TYPE_EREADER ),
+			'Barnes & Noble Nook HD'					=> array( 'Barnes & Noble', 'NOOK HD Tablet', TYPE_EREADER ),
 			'Barnes & Noble Nook HD+'					=> array( 'Barnes & Noble', 'NOOK HD+ Tablet', TYPE_EREADER ),
 			'BenWee 5100'								=> array( 'BenWee', '5100' ),
 			'CA907AAC0G'								=> array( 'Besta', 'CA907AAC0G' ),
+			'BLU DASH 3.5'								=> array( 'BLU', 'Dash 3.5' ),
+			'BLU Quattro 4.5'							=> array( 'BLU', 'Quattro 4.5' ),
+			'BLU Quattro 4.5 HD'						=> array( 'BLU', 'Quattro 4.5 HD' ),
+			'BLU STUDIO 5.3 II'							=> array( 'BLU', 'Studio 5.3 II' ),
+			'BLU P100i'									=> array( 'BLU', 'Touch Book 7.0 Plus', TYPE_TABLET ),
 			'(BLU )?VIVO 4.3!'							=> array( 'BLU', 'Vivo 4.3' ),
+			'B3000'										=> array( 'BlueBo', 'B3000' ),
+			'JC-S9220'									=> array( 'Bmorn', 'Phone One' ),
 			'BM999'										=> array( 'Bmorn', 'BM999', TYPE_TABLET ),
 			'V11'										=> array( 'Bmorn', 'V11', TYPE_TABLET ),
 			'V99'										=> array( 'Bmorn', 'V99', TYPE_TABLET ),
+			'BOVO S-F16'								=> array( 'Bovo', 'Walker S-F16' ),
+			'S-F16'										=> array( 'Bovo', 'Walker S-F16' ),
 			'BROR W60'									=> array( 'BROR', 'W60' ),
+			'BROR W68'									=> array( 'BROR', 'W68' ),
 			'bq DaVinci'								=> array( 'bq', 'DaVinci', TYPE_TABLET ),
+			'bq Elcano'									=> array( 'bq', 'Elcano', TYPE_TABLET ),
+			'bq Edison'									=> array( 'bq', 'Edison', TYPE_TABLET ),
 			'Maxwell Lite'								=> array( 'bq', 'Maxwell Lite', TYPE_TABLET ),
+			'bq Maxwell Plus'							=> array( 'bq', 'Maxwell Plus', TYPE_TABLET ),
+			'bq Pascal 2'								=> array( 'bq', 'Pascal 2', TYPE_TABLET ),
 			'CT704'										=> array( 'Carrefour', 'CT704', TYPE_TABLET ),
+			'CT705'										=> array( 'Carrefour', 'CT705', TYPE_TABLET ),
 			'CT1002'									=> array( 'Carrefour', 'CT1002', TYPE_TABLET ),
 			'Camangi-Mangrove7'							=> array( 'Camangi', 'Mangrove 7', TYPE_TABLET ),
 			'WS171'										=> array( 'Camangi', 'WebStation', TYPE_TABLET ),
@@ -396,16 +509,27 @@ class DeviceModels {
 			'C771'										=> array( 'Casio', 'GzOne Commando' ),
 			'VX-100'									=> array( 'Casio', 'VX-100 EPOS Terminal', TYPE_POS ),
 			'CAT NOVA'									=> array( 'Cat', 'NOVA', TYPE_TABLET ),
+			'Celkon A 200'								=> array( 'Celkon', 'A200' ),
+			'Celkon CT7'								=> array( 'Celkon', 'CT7', TYPE_TABLET ),
 			'W820'										=> array( 'Cellon', 'HW-W820' ),
 			'ChangHong-Z-ME'							=> array( 'ChangHong', 'Z-me' ),
 			'Changhong H5018'							=> array( 'ChangHong', 'H5018' ),
+			'ChanghongW6'								=> array( 'ChangHong', 'W6' ),
+			'Titan TV S320'								=> array( 'Cherry Mobile', 'Titan TV S320' ),
+			'W900'										=> array( 'Cherry Mobile', 'W900' ),
+			'LA-M1'										=> array( 'Chili', 'M1' ),
+			'LA-Q1'										=> array( 'Chili', 'Q1' ),
 			'ARMM3V'									=> array( 'chinaleap', 'ARMM3V', TYPE_TABLET ),
 			'CIUS-7!'									=> array( 'Cisco', 'Cius', TYPE_TABLET ),
-			'CSL Spice MI300'							=> array( 'CSL', 'Spice MI300' ),
-			'CSL-MI410'									=> array( 'CSL', 'Spice MI410' ),
+			'Cloudfone Excite320e'						=> array( 'Cloudfone', 'Excite 320e' ),
+			'Thrill 430x'								=> array( 'Cloudfone', 'Thrill 430x' ),
+			'AQUILA 080-1008'							=> array( 'CMX', 'Aquila MID 080-1008', TYPE_TABLET ),
 			'MID1024'									=> array( 'Coby', 'Kyros MID1024', TYPE_TABLET ),
+			'MID1042'									=> array( 'Coby', 'Kyros MID1042', TYPE_TABLET ),
+			'MID1045'									=> array( 'Coby', 'Kyros MID1045', TYPE_TABLET ),
 			'MID1125'									=> array( 'Coby', 'Kyros MID1125', TYPE_TABLET ),
 			'MID1126'									=> array( 'Coby', 'Kyros MID1126', TYPE_TABLET ),
+			'MID7002'									=> array( 'Coby', 'Kyros MID7002', TYPE_TABLET ),
 			'MID7010'									=> array( 'Coby', 'Kyros MID7010', TYPE_TABLET ),
 			'MID7012'									=> array( 'Coby', 'Kyros MID7012', TYPE_TABLET ),
 			'MID7015!'									=> array( 'Coby', 'Kyros MID7015', TYPE_TABLET ),
@@ -414,12 +538,21 @@ class DeviceModels {
 			'MID7022'									=> array( 'Coby', 'Kyros MID7022', TYPE_TABLET ),
 			'MID7024'									=> array( 'Coby', 'Kyros MID7024', TYPE_TABLET ),
 			'MID7025'									=> array( 'Coby', 'Kyros MID7025', TYPE_TABLET ),
+			'MID7032'									=> array( 'Coby', 'Kyros MID7032', TYPE_TABLET ),
+			'MID7033'									=> array( 'Coby', 'Kyros MID7033', TYPE_TABLET ),
 			'MID7034'									=> array( 'Coby', 'Kyros MID7034', TYPE_TABLET ),
 			'MID7035'									=> array( 'Coby', 'Kyros MID7035', TYPE_TABLET ),
+			'MID7036'									=> array( 'Coby', 'Kyros MID7036', TYPE_TABLET ),
+			'MID7042'									=> array( 'Coby', 'Kyros MID7042', TYPE_TABLET ),
+			'MID7048'									=> array( 'Coby', 'Kyros MID7048', TYPE_TABLET ),
 			'MID7127'									=> array( 'Coby', 'Kyros MID7127', TYPE_TABLET ),
 			'MID8024'									=> array( 'Coby', 'Kyros MID8024', TYPE_TABLET ),
+			'MID8042'									=> array( 'Coby', 'Kyros MID8042', TYPE_TABLET ),
+			'MID8048'									=> array( 'Coby', 'Kyros MID8048', TYPE_TABLET ),
 			'MID8125'									=> array( 'Coby', 'Kyros MID8125', TYPE_TABLET ),
 			'MID8127'									=> array( 'Coby', 'Kyros MID8127', TYPE_TABLET ),
+			'MID9042'									=> array( 'Coby', 'Kyros MID9042', TYPE_TABLET ),
+			'MID9742'									=> array( 'Coby', 'Kyros MID9742', TYPE_TABLET ),
 			'Z71'										=> array( 'Commtiva', 'Z71' ),
 			'V-T100'									=> array( 'Commtiva', 'V-T100' ),
 			'FIH-FB0'									=> array( 'Commtiva', 'HD700'),
@@ -444,25 +577,43 @@ class DeviceModels {
 			'5855'										=> array( 'Coolpad', '5855' ),
 			'Coolpad 5860!'								=> array( 'Coolpad', '5860' ),
 			'5860'										=> array( 'Coolpad', '5860' ),
+			'5860A'										=> array( 'Coolpad', '5860A' ),
+			'5860S'										=> array( 'Coolpad', '5860S' ),
 			'Coolpad 5870'								=> array( 'Coolpad', '5870' ),
+			'5870'										=> array( 'Coolpad', '5870' ),
+			'Coolpad 5876'								=> array( 'Coolpad', '5876' ),
+			'Coolpad 5880'								=> array( 'Coolpad', '5880' ),
+			'Coolpad 5890'								=> array( 'Coolpad', '5890' ),
 			'Coolpad 7005'								=> array( 'Coolpad', '7005' ),
 			'Coolpad 7019!'								=> array( 'Coolpad', '7019' ),
-			'Coolpad 7230'								=> array( 'Coolpad', '7230' ),
+			'Coolpad 7020'								=> array( 'Coolpad', '7020' ),
+			'Coolpad 7230!'								=> array( 'Coolpad', '7230' ),
 			'7260'										=> array( 'Coolpad', '7260' ),
 			'Coolpad 7260!'								=> array( 'Coolpad', '7260' ),
 			'7266'										=> array( 'Coolpad', '7266' ),
+			'Coolpad 7290'								=> array( 'Coolpad', '7290' ),
+			'Coolpad 7295'								=> array( 'Coolpad', '7295' ),
+			'Coolpad 7728'								=> array( 'Coolpad', '7728' ),
+			'Coolpad 8010'								=> array( 'Coolpad', '8010' ),
 			'Coolpad 8013'								=> array( 'Coolpad', '8013' ),
+			'8022'										=> array( 'Coolpad', '8022' ),
 			'Coolpad 8026'								=> array( 'Coolpad', '8026' ),
+			'Coolpad 8028'								=> array( 'Coolpad', '8028' ),
+			'Coolpad 8050'								=> array( 'Coolpad', '8050' ),
+			'Coolpad -8190'								=> array( 'Coolpad', '8190' ),
 			'Coolpad 8809'								=> array( 'Coolpad', '8809' ),
 			'Coolpad 8810'								=> array( 'Coolpad', '8810' ),
 			'8810'										=> array( 'Coolpad', '8810' ),
 			'Coolpad 8811'								=> array( 'Coolpad', '8811' ),
+			'Coolpad 9070'								=> array( 'Coolpad', '9070' ),
 			'Coolpad 9120'								=> array( 'Coolpad', '9120' ),
 			'Coolpad 9900'								=> array( 'Coolpad', '9900' ),
 			'Coolpad 9960'								=> array( 'Coolpad', '9960' ),
+			'CMP741E'									=> array( 'Craig', 'CMP741e', TYPE_TABLET ),
 			'ZiiO7'										=> array( 'Creative', 'ZiiO 7', TYPE_TABLET ),
 			'ZiiLABS ZiiO7'								=> array( 'Creative', 'ZiiO 7', TYPE_TABLET ),
 			'ZiiLABS ZiiO10 '							=> array( 'Creative', 'ZiiO 10', TYPE_TABLET ),
+			'CTP828BT'									=> array( 'Cresta', 'CTP828BT', TYPE_TABLET ),
 			'CUBE K8GT A'								=> array( 'Cube', 'K8GT A', TYPE_TABLET ),
 			'CUBE K8GT B'								=> array( 'Cube', 'K8GT B', TYPE_TABLET ),
 			'K8GT C'									=> array( 'Cube', 'K8GT C', TYPE_TABLET ),
@@ -471,26 +622,39 @@ class DeviceModels {
 			'K8GT W'									=> array( 'Cube', 'K8GT W', TYPE_TABLET ),
 			'CUBE U8GT'									=> array( 'Cube', 'U8GT', TYPE_TABLET ),
 			'CUBE U9GT'									=> array( 'Cube', 'U9GT', TYPE_TABLET ),
-			'CUBE U9GT ?2!'								=> array( 'Cube', 'U9GT 2', TYPE_TABLET ),
 			'U9GT'										=> array( 'Cube', 'U9GT', TYPE_TABLET ),
-			'U9GT2!'									=> array( 'Cube', 'U9GT 2', TYPE_TABLET ),
-			'N90 From moage.com'						=> array( 'Cube', 'U9GT 2', TYPE_TABLET ),
-			'U9GT3'										=> array( 'Cube', 'U9GT 3', TYPE_TABLET ),
 			'U9GT S'									=> array( 'Cube', 'U9GT S', TYPE_TABLET ),
 			'U9GT S A'									=> array( 'Cube', 'U9GT SA', TYPE_TABLET ),
 			'U9GTS A'									=> array( 'Cube', 'U9GT SA', TYPE_TABLET ),
-			'U10GT 2'									=> array( 'Cube', 'U10GT 2', TYPE_TABLET ),
+			'U9GT V'									=> array( 'Cube', 'U9GT V', TYPE_TABLET ),
+			'CUBE U9GT ?2!'								=> array( 'Cube', 'U9GT2', TYPE_TABLET ),
+			'U9GT2!'									=> array( 'Cube', 'U9GT2', TYPE_TABLET ),
+			'N90 From moage.com'						=> array( 'Cube', 'U9GT2', TYPE_TABLET ),
+			'U9GT3'										=> array( 'Cube', 'U9GT3', TYPE_TABLET ),
+			'U9GT3-S'									=> array( 'Cube', 'U9GT3 S', TYPE_TABLET ),
+			'U9GT4'										=> array( 'Cube', 'U9GT4', TYPE_TABLET ),
 			'U10GT S'									=> array( 'Cube', 'U10GT S', TYPE_TABLET ),
+			'U10GT 2'									=> array( 'Cube', 'U10GT2', TYPE_TABLET ),
 			'CUBE U15GT'								=> array( 'Cube', 'U15GT', TYPE_TABLET ),
-			'U18GT2'									=> array( 'Cube', 'U18GT 2', TYPE_TABLET ),
+			'U18GT-H'									=> array( 'Cube', 'U18GT H', TYPE_TABLET ),
+			'U18GT-W'									=> array( 'Cube', 'U18GT W', TYPE_TABLET ),
+			'U18GT2'									=> array( 'Cube', 'U18GT2', TYPE_TABLET ),
+			'U19GT-W'									=> array( 'Cube', 'U19GT W', TYPE_TABLET ),
+			'U20GT'										=> array( 'Cube', 'U20GT', TYPE_TABLET ),
 			'U23GT'										=> array( 'Cube', 'U23GT', TYPE_TABLET ),
+			'U25GT'										=> array( 'Cube', 'U25GT', TYPE_TABLET ),
 			'U30GT-H'									=> array( 'Cube', 'U30GT H', TYPE_TABLET ),
 			'U30GT-M'									=> array( 'Cube', 'U30GT M', TYPE_TABLET ),
 			'U30GT MINI'								=> array( 'Cube', 'U30GT Mini', TYPE_TABLET ),
+			'U30GT-mini'								=> array( 'Cube', 'U30GT Mini', TYPE_TABLET ),
 			'CUBE Q7PRO'								=> array( 'Cube', 'Q7 Pro', TYPE_TABLET ),
 			'CUBE Q7PRO J'								=> array( 'Cube', 'Q7 Pro', TYPE_TABLET ),
+			'LT8088'									=> array( 'Curtis', 'Klu LT8088', TYPE_TABLET ),
 			'Cydle M7!'									=> array( 'Cydle', 'M7 MultiPAD', TYPE_TABLET ),
+			'DAKELE MC001'								=> array( 'Dakele', 'MC001' ),
+			'EVOPad R9720'								=> array( 'Dark', 'EvoPad R9720', TYPE_TABLET ),
 			'HB-100 DASAN'								=> array( 'Dasan', 'HB-100', TYPE_TELEVISION ),
+			'HB-100 DASAN Networks, Inc.'				=> array( 'Dasan', 'HB-100', TYPE_TELEVISION ),
 			'Dell Aero'									=> array( 'Dell', 'Aero' ),
 			'Dell M01M'									=> array( 'Dell', 'Mini 5', TYPE_TABLET ),
 			'Dell Streak'								=> array( 'Dell', 'Streak', TYPE_TABLET ),
@@ -506,42 +670,70 @@ class DeviceModels {
 			'Dell XCD35'								=> array( 'Dell', 'XCD35' ),
 			'XCD35'										=> array( 'Dell', 'XCD35' ),
 			'deovo V5'									=> array( 'deovo', 'V5' ),
+			'Digma iDj7'								=> array( 'Digma', 'iDj7', TYPE_TABLET ),
 			'iDx7'										=> array( 'Digma', 'iDx7', TYPE_TABLET ),
+			'iDxD7 3G'									=> array( 'Digma', 'iDxD7', TYPE_TABLET ),
 			'iDx10!'									=> array( 'Digma', 'iDx10', TYPE_TABLET ),
+			'DISTAB9000R'								=> array( 'Disgo', 'Distab 9000R', TYPE_TABLET ),
 			'DM009SH'									=> array( 'Disney Mobile', 'DM009SH' ),
 			'DM010SH'									=> array( 'Disney Mobile', 'DM010SH' ),
 			'DM012SH'									=> array( 'Disney Mobile', 'DM012SH' ),
 			'F-08D'										=> array( 'Disney Mobile', 'F-08D' ),
 			'P-05D'										=> array( 'Disney Mobile', 'P-05D' ),
+			'DJC Touchtab3'								=> array( 'DJC', 'Touchtab3', TYPE_TABLET ),
+			'DPS Dream 9'								=> array( 'DPS', 'Dream 9', TYPE_TABLET ),
 			'domod G20'									=> array( 'Domod', 'G20' ),
+			'M975'										=> array( 'Double Power', 'M975', TYPE_TABLET ),
 			'TD-1010'									=> array( 'Double Power', 'TD-1010', TYPE_TABLET ),
 			'Tablet-P27'								=> array( 'DracoTek', 'P27 Tablet', TYPE_TABLET ),
 			'ACM3066-8'									=> array( 'MY|eebo', 'Color Tablet', TYPE_TABLET ),
+			'SUPREME IPS Dual Core X200'				=> array( 'E-Boda', 'Supreme IPS Dual Core X200', TYPE_TABLET ),
+			'EBEST W16A'								=> array( 'EBEST', 'W16A' ),
+			'D709'										=> array( 'Empire Electronix', 'Tablet D709', TYPE_TABLET ),
 			'edgejr'									=> array( 'EnTourage', 'Pocket eDGe', TYPE_TABLET ),
 			'l97D'										=> array( 'EPad', 'l97D', TYPE_TABLET ),
 			'epade A360S'								=> array( 'epade', 'A360S' ),
 			'M4301'										=> array( 'Eston', 'MID M4301', 'media' ),
 			'P10AN'										=> array( 'Exper', 'Easypad P10AN', TYPE_TABLET ),
 			'Informer-702'								=> array( 'Explay', 'Informer 702', TYPE_TABLET ),
+			'informer 921'								=> array( 'Explay', 'Informer 921', TYPE_TABLET ),
 			'FIH-F0X'									=> array( 'FIH', 'F0X' ),
+			'Fly F350'									=> array( 'Fly', 'F350' ),
+			'Fly IQ237'									=> array( 'Fly', 'IQ237' ),
 			'Fly IQ245'									=> array( 'Fly', 'IQ245 Wizard' ),
+			'Fly IQ245 Plus'							=> array( 'Fly', 'IQ245 Wizard Plus' ),
+			'IQ255'										=> array( 'Fly', 'IQ255 Pride' ),
+			'FLY IQ256'									=> array( 'Fly', 'IQ256 Vogue' ),
 			'Fly IQ260'									=> array( 'Fly', 'IQ260 BlackBird' ),
-			'Fly IQ285'									=> array( 'Fly', 'IQ285 Turbo' ),
+			'Fly IQ285!'								=> array( 'Fly', 'IQ285 Turbo' ),
+			'Fly IQ430'									=> array( 'Fly', 'IQ430 Evoke' ),
 			'(Fly )?IQ440!'								=> array( 'Fly', 'IQ440 Energie' ),
 			'(Fly )?IQ441!'								=> array( 'Fly', 'IQ441 Radiance' ),
 			'Fly IQ442'									=> array( 'Fly', 'IQ442 Miracle' ),
+			'Fly IQ444'									=> array( 'Fly', 'IQ444 Diamond' ),
+			'Fly IQ446'									=> array( 'Fly', 'IQ446 Magic' ),
+			'Fly IQ450'									=> array( 'Fly', 'IQ450 Horizon' ),
+			'BC1003'									=> array( 'Flytouch', 'BC1003', TYPE_TABLET ),
 			'NABI2-NV7A'								=> array( 'Fuhu', 'NABI', TYPE_TABLET ),
 			'ISW11F'									=> array( 'Fujitsu', 'Arrows Z' ),
 			'ISW13F'									=> array( 'Fujitsu', 'Arrows Z' ),
 			'IS12F'										=> array( 'Fujitsu', 'Arrows ES' ),
 			'F-01D'										=> array( 'Fujitsu', 'Arrows Tab LTE', TYPE_TABLET ),
+			'F-02E'										=> array( 'Fujitsu', 'Arrows X' ),
 			'F-03D'										=> array( 'Fujitsu', 'Arrows Kiss' ),
+			'F-03E'										=> array( 'Fujitsu', 'Arrows Kiss' ),
+			'F-04E'										=> array( 'Fujitsu', 'Arrows V' ),
 			'F-05D'										=> array( 'Fujitsu', 'Arrows X LTE' ),
+			'F-05E'										=> array( 'Fujitsu', 'Arrows Tab' ),
 			'F-07D'										=> array( 'Fujitsu', 'Arrows μ' ),
+			'F-09D'										=> array( 'Fujitsu', 'ANTEPRIMA' ),
 			'F-10D'										=> array( 'Fujitsu', 'Arrows X F-10D' ),
 			'F-11D'										=> array( 'Fujitsu', 'Arrows Me' ),
 			'F-12C'										=> array( 'Fujitsu', 'Globetrotter' ),
+			'F-12D'										=> array( 'Fujitsu', 'F-12D' ),
 			'f12arc'									=> array( 'Fujitsu', 'F12arc' ),
+			'f12bob'									=> array( 'Fujitsu', 'F12bob' ),
+			'FJL21'										=> array( 'Fujitsu', 'Arrows ef FJL21' ),
 			'M532'										=> array( 'Fujitsu', 'Stylistic M532', TYPE_TABLET ),
 			'Garminfone'								=> array( 'Garmin-Asus', 'Garminfone' ),
 			'Garmin-Asus A10'							=> array( 'Garmin-Asus', 'Nuvifone A10' ),
@@ -552,16 +744,20 @@ class DeviceModels {
 			'Gemei G3'									=> array( 'Gemei', 'G3', TYPE_TABLET ),
 			'Gemei G9'									=> array( 'Gemei', 'G9', TYPE_TABLET ),
 			'GEM7008'									=> array( 'Gemini', 'JoyTab GEM7008', TYPE_TABLET ),
+			'GSmart G1310'								=> array( 'Gigabyte', 'GSmart G1310' ),
 			'GSmart G1317D'								=> array( 'Gigabyte', 'GSmart G1317D' ),
 			'GSmart G1342'								=> array( 'Gigabyte', 'GSmart G1342' ),
 			'GSmart G1345'								=> array( 'Gigabyte', 'GSmart G1345' ),
 			'GSmart G1362'								=> array( 'Gigabyte', 'GSmart G1362' ),
+			'GSmart GS202!'								=> array( 'Gigabyte', 'GSmart GS202' ),
 			'Gigabyte TB100'							=> array( 'Gigabyte', 'TB100', TYPE_TABLET ),
 			'GIO-GiONEE C500'							=> array( 'Gionee', 'C500' ),
 			'GIO-GiONEE C600'							=> array( 'Gionee', 'C600' ),
 			'GN100'										=> array( 'Gionee', 'GN100' ),		
 			'GN105'										=> array( 'Gionee', 'GN105' ),		
+			'GN106'										=> array( 'Gionee', 'GN106' ),		
 			'GN109'										=> array( 'Gionee', 'GN109' ),
+			'GN135'										=> array( 'Gionee', 'GN135' ),
 			'GN180'										=> array( 'Gionee', 'GN180' ),
 			'GN200'										=> array( 'Gionee', 'GN200' ),		
 			'GN205'										=> array( 'Gionee', 'GN205' ),
@@ -569,18 +765,41 @@ class DeviceModels {
 			'GN360'										=> array( 'Gionee', 'GN360' ),
 			'GN700T'									=> array( 'Gionee', 'GN700T' ),
 			'GN700W'									=> array( 'Gionee', 'GN700W' ),
+			'GN708W'									=> array( 'Gionee', 'GN708W' ),
+			'GN800'										=> array( 'Gionee', 'GN800' ),
+			'GN818T'									=> array( 'Gionee', 'GN818T' ),
 			'GN858'										=> array( 'Gionee', 'GN858' ),
+			'GN868'										=> array( 'Gionee', 'GN86N7078' ),
+			'GOCLEVER'									=> array( 'Goclever', 'TAB', TYPE_TABLET ),
+			'GOCLEVER TAB A73'							=> array( 'Goclever', 'TAB A73', TYPE_TABLET ),
+			'GOCLEVER TAB A93'							=> array( 'Goclever', 'TAB A93', TYPE_TABLET ),
 			'GOCLEVER TAB A103'							=> array( 'Goclever', 'TAB A103', TYPE_TABLET ),
 			'GOCLEVER TAB A104'							=> array( 'Goclever', 'TAB A104', TYPE_TABLET ),
+			'GOCLEVER TAB M703G'						=> array( 'Goclever', 'TAB M703G', TYPE_TABLET ),
+			'GOCLEVER TAB R106'							=> array( 'Goclever', 'TAB R106', TYPE_TABLET ),
+			'GOCLEVER TAB T76'							=> array( 'Goclever', 'TAB T76', TYPE_TABLET ),
+			'GOCLEVER TAB 9300'							=> array( 'Goclever', 'TAB 9300', TYPE_TABLET ),
+			'M758A'										=> array( 'Gpad', 'M758A', TYPE_TABLET ),
+			'GO M3'										=> array( 'GreenOrange', 'M3' ),
+			'HE-E760'									=> array( 'Haier', 'HE-E760' ),
 			'Haier-HT-I617'								=> array( 'Haier', 'HT-I617' ),
+			'HT-I617'									=> array( 'Haier', 'HT-I617' ),
 			'Haier HW-W910'								=> array( 'Haier', 'HW-W910' ),
 			'W718'										=> array( 'Haier', 'W718' ),
 			'I9220'										=> array( 'Haipai', 'I9220' ),
+			'X710d'										=> array( 'Haipai', 'X710D' ),
 			'X720D'										=> array( 'Haipai', 'X720D' ),
 			'SN10T1'									=> array( 'HANNspree', 'HANNSpad SN10T1', TYPE_TABLET ),
 			'SN10T2'									=> array( 'HANNspree', 'HANNSpad SN10T2', TYPE_TABLET ),
 			'HannsComb'									=> array( 'HANNspree', 'HANNSpad', TYPE_TABLET ),
+			'Hannspadd'									=> array( 'HANNspree', 'HANNSpad', TYPE_TABLET ),
+			'MITO A300'									=> array( 'Harga', 'MITO A300' ),
 			'X1'										=> array( 'HCL', 'ME X1', TYPE_TABLET ),
+			'Y2'										=> array( 'HCL', 'ME Y2', TYPE_TABLET ),
+			'H701'										=> array( 'Hedy', 'H701' ),
+			'9300+'										=> array( 'Hero', '9300+' ),
+			'H2000+'									=> array( 'Hero', 'H2000+' ),
+			'H9500'										=> array( 'Hero', 'H9500' ),
 			'MID Ser(ai|ia)ls!'							=> array( 'Herotab', 'C8', TYPE_TABLET ),
 			'HILIVE H7'									=> array( 'Hilive', 'H7' ),
 			'HS-7DTB6-4GB'								=> array( 'Hipstreet', '7" Aurora tablet', TYPE_TABLET ),
@@ -588,18 +807,25 @@ class DeviceModels {
 			'COSMO DUO'									=> array( 'Hiscreen', 'Cosmo DUO', TYPE_TABLET ),
 			'HS-U8'										=> array( 'Hisense', 'U8' ),
 			'HS-U950'									=> array( 'Hisense', 'U950' ),
+			'HS-U960Q'									=> array( 'Hisense', 'U960' ),
 			'HS-T92'									=> array( 'Hisense', 'T92' ),
 			'T92'										=> array( 'Hisense', 'T92' ),
+			'Hisense T92'								=> array( 'Hisense', 'T92' ),
 			'HS-T96'									=> array( 'Hisense', 'T96' ),
 			'HS-T909'									=> array( 'Hisense', 'T909' ),
+			'HS-T930'									=> array( 'Hisense', 'T930' ),
+			'HS-E830'									=> array( 'Hisense', 'E830' ),
 			'HS-E860'									=> array( 'Hisense', 'E860' ),
 			'E860'										=> array( 'Hisense', 'E860' ),
 			'HS-E910'									=> array( 'Hisense', 'E910' ),
 			'HS-E920'									=> array( 'Hisense', 'E920' ),
 			'HS-E926'									=> array( 'Hisense', 'E926' ),
+			'HS-E956Q'									=> array( 'Hisense', 'E956' ),
 			'HS-EG900'									=> array( 'Hisense', 'EG900' ),
 			'HS-EG906'									=> array( 'Hisense', 'EG906' ),
+			'HS-EG909'									=> array( 'Hisense', 'EG909' ),
 			'AD683G'									=> array( 'Hisense', 'EG909' ),
+			'HS-EG950'									=> array( 'Hisense', 'EG950' ),
 			'HS-ET919'									=> array( 'Hisense', 'ET919' ),
 			'EG968B'									=> array( 'Hisense', 'EG968B' ),
 			'HKPHONE H8-3G'								=> array( 'HKPhone', 'H8 3G' ),
@@ -616,6 +842,8 @@ class DeviceModels {
 			'HTC A810e'									=> array( 'HTC', 'ChaCha' ),
 			'HTC A9188!'								=> array( 'HTC', 'Cullinan' ),
 			'HTC Desire C'								=> array( 'HTC', 'Desire C' ),
+			'HTC H1000C'								=> array( 'HTC', 'Desire C' ),
+			'HTC A320e'									=> array( 'HTC', 'Desire C' ),
 			'HTC Desire ?HD!'							=> array( 'HTC', 'Desire HD' ),
 			'HTC A91(91|92)!'							=> array( 'HTC', 'Desire HD' ),
 			'HTC ?Desire ?S( |$)!'						=> array( 'HTC', 'Desire S' ),
@@ -628,6 +856,8 @@ class DeviceModels {
 			'HTC T328d'									=> array( 'HTC', 'Desire VC' ),
 			'HTC Desire VT'								=> array( 'HTC', 'Desire VT' ),
 			'HTC T328t'									=> array( 'HTC', 'Desire VT' ),
+			'HTC Desire ?X!'							=> array( 'HTC', 'Desire X' ),
+			'HTC T329w'									=> array( 'HTC', 'Desire X' ),
 			'HTC Desire ?Z!'							=> array( 'HTC', 'Desire Z' ),
 			'HTC Vision'								=> array( 'HTC', 'Desire Z' ),
 			'HTC A72(71|72|75)!'						=> array( 'HTC', 'Desire Z' ),
@@ -636,19 +866,21 @@ class DeviceModels {
 			'HTC A81(81|83)!'							=> array( 'HTC', 'Desire' ),
 			'HTC ?X06HT!'								=> array( 'HTC', 'Desire' ),
 			'HTC Dream'									=> array( 'HTC', 'Dream' ),
+			'HTC Droid DNA'								=> array( 'HTC', 'Droid DNA' ),
 			'HTC Droid Incredible'						=> array( 'HTC', 'Droid Incredible' ),
 			'HTC S710d'									=> array( 'HTC', 'Droid Incredible 2' ),
 			'HTC Incredible 2'							=> array( 'HTC', 'Droid Incredible 2' ),
-			'HTC EVO ?3D!'								=> array( 'HTC', 'EVO 3D' ),
+			'HTC ?EVO ?3D!'								=> array( 'HTC', 'EVO 3D' ),
 			'HTC X51(5a|5c|5d|5m)!'						=> array( 'HTC', 'EVO 3D' ),
 			'HTC EVO 4G\+!'								=> array( 'HTC', 'EVO 4G+' ),
 			'HTC X515e'									=> array( 'HTC', 'EVO 4G+' ),
 			'HTC ?EVO ?4G!'								=> array( 'HTC', 'EVO 4G' ),
 			'HTC jewel'									=> array( 'HTC', 'EVO 4G' ),
+			'HTC ?EVO ?V ?4G!'							=> array( 'HTC', 'EVO V 4G' ),
 			'HTC ?(EVO ?)?Design ?4G!'					=> array( 'HTC', 'EVO Design 4G' ),		
 			'HTC C715c'									=> array( 'HTC', 'EVO Design 4G' ),
 			'HTC EVO Shift!'							=> array( 'HTC', 'EVO Shift' ),
-			'HTC Explorer!'								=> array( 'HTC', 'Explorer' ),
+			'HTC ?Explorer!'							=> array( 'HTC', 'Explorer' ),
 			'HTC A31(0b|0e)!'							=> array( 'HTC', 'Explorer' ),
 			'HTC Flyer!'								=> array( 'HTC', 'Flyer', TYPE_TABLET ),
 			'HTC P51(0e|2|5e)!'							=> array( 'HTC', 'Flyer', TYPE_TABLET ),
@@ -668,8 +900,9 @@ class DeviceModels {
 			'HTC H3000C'								=> array( 'HTC', 'Hero' ),
 			'HTC IMAGIO'								=> array( 'HTC', 'Imagio' ),
 			'HTC Incredible'							=> array( 'HTC', 'Incredible' ),
+			'HTC Incredible CDMA'						=> array( 'HTC', 'Incredible' ),
 			'HTC Incredible ?S!'						=> array( 'HTC', 'Incredible S' ),
-			'HTC Vivo'									=> array( 'HTC', 'Incredible S' ),
+			'HTC ?Vivo!'								=> array( 'HTC', 'Incredible S' ),
 			'HTC S710e!'								=> array( 'HTC', 'Incredible S' ),
 			'HTC Innovation'							=> array( 'HTC', 'Innovation' ),
 			'HTC (HD7 )?Inspire!'						=> array( 'HTC', 'Inspire 4G' ),
@@ -677,28 +910,41 @@ class DeviceModels {
 			'HTC X920e'									=> array( 'HTC', 'J Butterfly' ),
 			'HTC Butterfly'								=> array( 'HTC', 'J Butterfly' ),
 			'HTC P715a'									=> array( 'HTC', 'Jetstream', TYPE_TABLET ),
+			'HTC PG09410'								=> array( 'HTC', 'Jetstream', TYPE_TABLET ),
 			'HTC Legend'								=> array( 'HTC', 'Legend' ),
 			'HTC Magic!'								=> array( 'HTC', 'Magic' ),
 			'HTC Sapphire'								=> array( 'HTC', 'Magic' ),
+			'HTC Merge'									=> array( 'HTC', 'Merge' ),
 			'HTC Lexikon'								=> array( 'HTC', 'Merge' ),
 			'HTC One S'									=> array( 'HTC', 'One S' ),
 			'HTC One S !'								=> array( 'HTC', 'One S' ),
 			'HTC Z(52|56)0e!'							=> array( 'HTC', 'One S' ),
 			'HTC T528d'									=> array( 'HTC', 'One SC' ),
+			'HTC T528t'									=> array( 'HTC', 'One ST' ),
 			'HTC T528w'									=> array( 'HTC', 'One SU' ),
-			'HTC One SV'								=> array( 'HTC', 'One SV' ),
+			'HTC One ?SV!'								=> array( 'HTC', 'One SV' ),
+			'HTC C525c'									=> array( 'HTC', 'One SV' ),
+			'HTC C525u'									=> array( 'HTC', 'One SV' ),
 			'HTC One V'									=> array( 'HTC', 'One V' ),
+			'HTC T120C'									=> array( 'HTC', 'One V' ),
 			'HTC T320e'									=> array( 'HTC', 'One V' ),
 			'HTC H2000C'								=> array( 'HTC', 'One V' ),
 			'HTC One VX'								=> array( 'HTC', 'One VX' ),
 			'HTC One X'									=> array( 'HTC', 'One X' ),
 			'HTC Endeavour!'							=> array( 'HTC', 'One X' ),
 			'HTC S720e'									=> array( 'HTC', 'One X' ),
+			'HTC One X S720e'							=> array( 'HTC', 'One X' ),
+			'HTC One X with Beats Audio'				=> array( 'HTC', 'One X' ),
 			'HTC One X+'								=> array( 'HTC', 'One X+' ),
 			'HTC OneXplus'								=> array( 'HTC', 'One X+' ),
 			'HTC PM63100'								=> array( 'HTC', 'One X+' ),
+			'HTC X720d'									=> array( 'HTC', 'One XC' ),
 			'HTC One XL'								=> array( 'HTC', 'One XL' ),
 			'HTC S720t'									=> array( 'HTC', 'One XT' ),
+			'HTC PN071'									=> array( 'HTC', 'One' ),
+			'HTC PN072'									=> array( 'HTC', 'One' ),
+			'HTC One 801e'								=> array( 'HTC', 'One' ),
+			'HTC One'									=> array( 'HTC', 'One' ),
 			'HTC Raider!'								=> array( 'HTC', 'Raider 4G' ),
 			'HTC Holiday'								=> array( 'HTC', 'Raider 4G' ),
 			'HTC X710(a|e|s)!'							=> array( 'HTC', 'Raider 4G' ),
@@ -726,6 +972,7 @@ class DeviceModels {
 			'HTC A3288'									=> array( 'HTC', 'Tattoo' ),
 			'HTC A9188'									=> array( 'HTC', 'Tianxi' ),
 			'HTC X310e'									=> array( 'HTC', 'Titan' ),
+			'HTC Polaris'								=> array( 'HTC', 'Touch Cruise' ),
 			'HTC DiamondII EX'							=> array( 'HTC', 'Touch Diamond II' ),
 			'HTC T7373'									=> array( 'HTC', 'Touch Pro II' ),
 			'HTC ThunderBolt( 4G)?!'					=> array( 'HTC', 'ThunderBolt'),	
@@ -733,21 +980,25 @@ class DeviceModels {
 			'HTC Velocity!'								=> array( 'HTC', 'Velocity 4G'),
 			'HTC ?Wildfire ?S!'							=> array( 'HTC', 'Wildfire S' ),	
 			'HTC .*A510(a|b|c|e)!'						=> array( 'HTC', 'Wildfire S' ),
+			'HTC ?PG762!'								=> array( 'HTC', 'Wildfire S' ),
 			'HTC Wildfire!'								=> array( 'HTC', 'Wildfire' ),
 			'HTC .*A33(33|66|80)!'						=> array( 'HTC', 'Wildfire' ),
 			'HTC A6390'									=> array( 'HTC', 'A6390' ),
 			'HTC A8180'									=> array( 'HTC', 'A8180' ),
-			'HTC PG762'									=> array( 'HTC', 'PG762' ),
 			'HTC S610d'									=> array( 'HTC', 'S610d' ),
 			'HTC S715e'									=> array( 'HTC', 'S715e' ),
 			'HTC T329t'									=> array( 'HTC', 'T329t' ),
 			'HTC Z510d'									=> array( 'HTC', 'Z510d' ),
+			'HTC GOF U'									=> array( 'HTC', 'Desire C' ),
 			'HTC VLE U'									=> array( 'HTC', 'One S' ),
 			'HTC VLE#U'									=> array( 'HTC', 'One S' ),
 			'HTC VIE U'									=> array( 'HTC', 'One S' ),
+			'HTC K2 UL'									=> array( 'HTC', 'One SV' ),
 			'HTC EVA UL'								=> array( 'HTC', 'One V' ),
-			'HTC DLX U'									=> array( 'HTC', 'Droid DNA' ),
+//			'HTC IMN WLJ'								
+			'HTC DLX WLJ'								=> array( 'HTC', 'J Butterfly' ),
 			'HTC DLX WL'								=> array( 'HTC', 'Droid DNA' ),
+			'HTC DLX U'									=> array( 'HTC', 'Droid DNA' ),
 			'HTC6435LVW!'								=> array( 'HTC', 'Droid DNA' ),
 			'DLX'										=> array( 'HTC', 'Droid DNA' ),
 			'HTC ENR U'									=> array( 'HTC', 'One X' ),
@@ -770,6 +1021,7 @@ class DeviceModels {
 			'Evo HD2'									=> array( 'HTC', 'EVO HD' ),
 			'EVO ?3D!'									=> array( 'HTC', 'EVO 3D' ),
 			'EVO 4G'									=> array( 'HTC', 'EVO 4G' ),
+			'Evo V 4G'									=> array( 'HTC', 'EVO V 4G' ),
 			'photon'									=> array( 'HTC', 'HD mini' ),
 			'HD2'										=> array( 'HTC', 'HD2' ),
 			'NexusHD2'									=> array( 'HTC', 'HD2' ),
@@ -784,6 +1036,7 @@ class DeviceModels {
 			'Inspire 4G'								=> array( 'HTC', 'Inspire 4G' ),
 			'Legend'									=> array( 'HTC', 'Legend' ),
 			'Docomo HT-03A'								=> array( 'HTC', 'Magic' ),
+			'One S'										=> array( 'HTC', 'One S' ),
 			'One X'										=> array( 'HTC', 'One X' ),
 			'One V'										=> array( 'HTC', 'One V' ),
 			'Rezound'									=> array( 'HTC', 'Rezound' ),
@@ -794,12 +1047,14 @@ class DeviceModels {
 			'Pyramid'									=> array( 'HTC', 'Sensation' ),
 			'TripNiCE Pyramid'							=> array( 'HTC', 'Sensation' ),
 			'Click'										=> array( 'HTC', 'Tattoo' ),
+			'Vivid 4G'									=> array( 'HTC', 'Vivid 4G' ),
 			'Wildfire S!'								=> array( 'HTC', 'Wildfire S' ),
 			'Wildfire!'									=> array( 'HTC', 'Wildfire' ),
 			'Sprint APX515CKT'							=> array( 'HTC', 'EVO 3D' ),
 			'Sprint APA9292KT'							=> array( 'HTC', 'EVO 4G' ),
 			'Sprint APA7373KT'							=> array( 'HTC', 'EVO Shift 4G' ),
 			'Sprint APC715CKT'							=> array( 'HTC', 'EVO Design 4G' ),
+			'A320a'										=> array( 'HTC', 'Desire C' ),					
 			'A3380'										=> array( 'HTC', 'Wildfire' ),
 			'A6277'										=> array( 'HTC', 'Hero' ),
 			'a7272'										=> array( 'HTC', 'Desire Z' ),					
@@ -807,15 +1062,18 @@ class DeviceModels {
 			'S31HT'										=> array( 'HTC', 'Aria' ),
 			'S710d'										=> array( 'HTC', 'Droid Incredible 2' ),
 			'S710D'										=> array( 'HTC', 'Droid Incredible 2' ),
+			'T320a'										=> array( 'HTC', 'One V' ),
 			'X06HT'										=> array( 'HTC', 'Desire' ),
 			'001HT'										=> array( 'HTC', 'Desire HD' ),
 			'X325a'										=> array( 'HTC', 'One X' ),
 			'X525a'										=> array( 'HTC', 'One X+' ),
+			'X710E'										=> array( 'HTC', 'Raider 4G' ),
 			'Z520m'										=> array( 'HTC', 'One S' ),
 			'Z710'										=> array( 'HTC', 'Sensation' ),
 			'Z710e'										=> array( 'HTC', 'Sensation' ),
 			'T9199h'									=> array( 'HTC', 'T9199h' ),
 			'ADR6200'									=> array( 'HTC', 'Droid Eris' ),
+			'HTCADR6290US'								=> array( 'HTC', 'One V' ),
 			'ADR6300'									=> array( 'HTC', 'Droid Incredible' ),
 			'ADR6325!'									=> array( 'HTC', 'Merge' ),
 			'ADR6330VW'									=> array( 'HTC', 'Rhyme' ),	
@@ -826,7 +1084,7 @@ class DeviceModels {
 			'Coquettish Red'							=> array( 'HTC', 'Rezound' ),
 			'PB99400'									=> array( 'HTC', 'Desire' ),	
 			'pcdadr6350'								=> array( 'HTC', 'Droid Incredible 2' ),
-			'PC36100'									=> array( 'HTC', 'EVO 4G' ),
+			'PC36100!'									=> array( 'HTC', 'EVO 4G' ),
 			'PG06100'									=> array( 'HTC', 'EVO Shift 4G' ),
 			'PG41200'									=> array( 'HTC', 'EVO View 4G', TYPE_TABLET ),
 			'PG86100!'									=> array( 'HTC', 'EVO 3D' ),
@@ -838,6 +1096,7 @@ class DeviceModels {
 			'ISW12HT'									=> array( 'HTC', 'EVO 3D' ),
 			'ISW13HT'									=> array( 'HTC', 'J' ),
 			'HTL21'										=> array( 'HTC', 'J Butterfly' ),
+			'HTX21'										=> array( 'HTC', 'au Infobar A02' ),
 			'USCCADR6275US!'							=> array( 'HTC', 'Desire' ),
 			'USCCADR6285US!'							=> array( 'HTC', 'Hero S' ),
 			'USCCADR6325US!'							=> array( 'HTC', 'Merge' ),
@@ -846,21 +1105,29 @@ class DeviceModels {
 			'Huawei S7-312u'							=> array( 'Huawei', 'MediaPad', TYPE_TABLET ),
 			'MediaPad 7 Lite'							=> array( 'Huawei', 'MediaPad 7 Lite', TYPE_TABLET ),
 			'MediaPad 10 FHD'							=> array( 'Huawei', 'MediaPad 10', TYPE_TABLET ),
+			'Huawei A199'								=> array( 'Huawei', 'A199' ),
 			'Huawei C8500!'								=> array( 'Huawei', 'C8500' ),
 			'Huawei C8600'								=> array( 'Huawei', 'C8600' ),
 			'Huawei C8650!'								=> array( 'Huawei', 'C8650' ),
+			'Huawei C8655'								=> array( 'Huawei', 'Ascend Y201C' ),
 			'Huawei C8800'								=> array( 'Huawei', 'IDEOS X5' ),
 			'Huawei C8810'								=> array( 'Huawei', 'Ascend G300' ),
 			'Huawei C8812!'								=> array( 'Huawei', 'Ascend C8812' ),
+			'Huawei C8813!'								=> array( 'Huawei', 'Ascend C8813' ),
 			'Huawei C8825D'								=> array( 'Huawei', 'Ascend G330C' ),
+			'Huawei C8826D'								=> array( 'Huawei', 'Ascend G500C' ),
 			'Huawei C8860E'								=> array( 'Huawei', 'Honor' ),
 			'Huawei C8950D'								=> array( 'Huawei', 'Honor+' ),
 			'Huawei G300'								=> array( 'Huawei', 'Ascend G300' ),
+			'Huawei G7500'								=> array( 'Huawei', 'G7500' ),
+			'Huawei H867G'								=> array( 'Huawei', 'H867G' ),
 			'Huawei M835'								=> array( 'Huawei', 'M835' ),
 			'Huawei M860'								=> array( 'Huawei', 'Ascend' ),
 			'Huawei M920'								=> array( 'Huawei', 'M920' ),
 			'Huawei M921'								=> array( 'Huawei', 'M921' ),
 			'Huawei M931'								=> array( 'Huawei', 'M931' ),
+			'Huawei MT1-U06'							=> array( 'Huawei', 'Ascend Mate' ),
+			'Huawei MT1-T00'							=> array( 'Huawei', 'Ascend Mate' ),
 			'Huawei S8520'								=> array( 'Huawei', 'S8520' ),
 			'Huawei S8600'								=> array( 'Huawei', 'S8600' ),
 			'Huawei T8100'								=> array( 'Huawei', 'T8100' ),
@@ -870,7 +1137,9 @@ class DeviceModels {
 			'Huawei T8620'								=> array( 'Huawei', 'Ascend Y200T' ),
 			'Huawei T8828'								=> array( 'Huawei', 'Ascend G305T' ),
 			'Huawei T8830'								=> array( 'Huawei', 'Ascend G309T' ),
+			'Huawei T8833'								=> array( 'Huawei', 'Ascend Y300' ),
 			'Huawei T8950'								=> array( 'Huawei', 'Honor+' ),
+			'Huawei T8951'								=> array( 'Huawei', 'Ascend G510' ),
 			'Huawei T9200'								=> array( 'Huawei', 'Ascend P1' ),
 			'Huawei U8220'								=> array( 'Huawei', 'U8220' ),
 			'Huawei U8500'								=> array( 'Huawei', 'IDEOS X2' ),
@@ -889,18 +1158,27 @@ class DeviceModels {
 			'Huawei U8850'								=> array( 'Huawei', 'Vision' ),
 			'Huawei U8860'								=> array( 'Huawei', 'Honor' ),
 			'Huawei U8950!'								=> array( 'Huawei', 'Ascend G600' ),
-			'Huawei ?U9000'								=> array( 'Huawei', 'Ascend X' ),
+			'Huawei ?U9000!'							=> array( 'Huawei', 'Ascend X' ),
 			'Huawei U9508'								=> array( 'Huawei', 'Honor 2' ),
+			'Huawei ?U9508!'							=> array( 'Huawei', 'Honor 2 Quad-core' ),
 			'Huawei U9510!'								=> array( 'Huawei', 'Ascend D quad' ),
 			'Huawei D2-0082'							=> array( 'Huawei', 'Ascend D2' ),
+			'Huawei D2-2010'							=> array( 'Huawei', 'Ascend D2' ),
+			'Huawei P2-6011'							=> array( 'Huawei', 'Ascend P2' ),
+			'Huawei P2-6070'							=> array( 'Huawei', 'Ascend P2' ),
 			'Huawei IDEOS U8500'						=> array( 'Huawei', 'IDEOS X2' ),
 			'Huawei IDEOS U8650'						=> array( 'Huawei', 'Sonic' ),
 			'Huawei IDEOS X3'							=> array( 'Huawei', 'IDEOS X3' ),
 			'Huawei Ideos X5!'							=> array( 'Huawei', 'IDEOS X5' ),
 			'Huawei SONIC'								=> array( 'Huawei', 'Sonic' ),
 			'Huawei 8100-9'								=> array( 'Huawei', 'U8100' ),
+			'Huawei Ascend G 300'						=> array( 'Huawei', 'Ascend G300' ),
 			'Ascend G300'								=> array( 'Huawei', 'Ascend G300' ),
+			'Huawei G510!'								=> array( 'Huawei', 'Ascend G510' ),
+			'Huawei G520-5000'							=> array( 'Huawei', 'Ascend G520' ),
+			'Huawei Y 220T'								=> array( 'Huawei', 'Ascend Y220T' ),
 			'Huawei Y300!'								=> array( 'Huawei', 'Ascend Y300' ),
+			'Huawei Y310!'								=> array( 'Huawei', 'Ascend Y310' ),
 			'Huawei Ascend X'							=> array( 'Huawei', 'Ascend X' ),
 			'FUSIONideos'								=> array( 'Huawei', 'IDEOS' ),
 			'Gnappo Ideos'								=> array( 'Huawei', 'IDEOS' ),
@@ -912,6 +1190,7 @@ class DeviceModels {
 			'Kyivstar Aqua'								=> array( 'Huawei', 'Sonic' ),
 			'Lucky Ultra Sonic U8650'					=> array( 'Huawei', 'Sonic' ),
 			'MTC Android'								=> array( 'Huawei', 'U8110' ),
+			'A01HW'										=> array( 'Huawei', 'eMobile A01HW', TYPE_TABLET ),
 			'S31HW'										=> array( 'Huawei', 'Pocket WiFi S' ),
 			'S41HW'										=> array( 'Huawei', 'Pocket WiFi S II' ),
 			'007HW'										=> array( 'Huawei', 'Vision' ),	
@@ -927,6 +1206,7 @@ class DeviceModels {
 			'C8800'										=> array( 'Huawei', 'C8800' ),
 			'C8810'										=> array( 'Huawei', 'Ascend G300C' ),
 			'C8812'										=> array( 'Huawei', 'Ascend C8812' ),
+			'CM980'										=> array( 'Huawei', 'Evolution II' ),
 			'S8600'										=> array( 'Huawei', 'S8600' ),
 			'T8620'										=> array( 'Huawei', 'Ascend Y200T' ),
 			'T8808!'									=> array( 'Huawei', 'Ascend G306T' ),
@@ -971,63 +1251,99 @@ class DeviceModels {
 			'DroniX-0.5'								=> array( 'Huawei', 'U8180' ),
 			'MTS-SP101'									=> array( 'Huawei', 'C8511' ),
 			'TSP21'										=> array( 'Huawei', 'U8110' ),
-			'HW-01E'									=> array( 'Huawei', 'Ascend HW-01E' ),								
+			'HW-01E'									=> array( 'Huawei', 'Ascend HW-01E' ),	
+			'H866C'										=> array( 'Huawei', 'Ascend Y H866C' ),								
+			'A7 HD'										=> array( 'Hyundai', 'A7 HD', TYPE_TABLET ),
 			'HYUNDAI H6'								=> array( 'Hyundai', 'Storm H6' ),
+			'HYUNDAI H8Q'								=> array( 'Hyundai', 'H8Q' ),
+			'HYUNDAI T7'								=> array( 'Hyundai', 'T7', TYPE_TABLET ),
 			'MW1031'									=> array( 'Hyundai', 'MW1031', TYPE_TABLET ),
+			'Andi3n'									=> array( 'iBall', 'Andi3n' ),
+			'iBall Andi3e'								=> array( 'iBall', 'Andi3e' ),
 			'iBall i6012'								=> array( 'iBall', 'Slide i6012', TYPE_TABLET ),
 			'iBall Slide i7011'							=> array( 'iBall', 'Slide i7011', TYPE_TABLET ),
 			'iBall Slide 3G 7334'						=> array( 'iBall', 'Slide 3G 7334', TYPE_TABLET ),
+			'AUXUS CoreX2 3G'							=> array( 'iBerry', 'Auxus CoreX2', TYPE_TABLET ),
 			'NetTAB RUNE'								=> array( 'IconBit', 'NetTab Rune', TYPE_TABLET ),
+			'NetTAB SPACE II Plus'						=> array( 'IconBit', 'NetTab Space II Plus', TYPE_TABLET ),
 			'NetTAB THOR-LE'							=> array( 'IconBit', 'NetTab Thor LE', TYPE_TABLET ),
 			'D70W'										=> array( 'Icoo', 'D70W', TYPE_TABLET ),
 			'D80'										=> array( 'Icoo', 'D80', TYPE_TABLET ),
 			'INFOBAR A01'								=> array( 'iida', 'INFOBAR A01' ),
 			'IMO S88'									=> array( 'IMO', 'Discovery S88' ),
 			'IMO S89'									=> array( 'IMO', 'Miracle S89' ),
+			'IMO S99'									=> array( 'IMO', 'Ocean S99' ),
+			'IMO S900'									=> array( 'IMO', 'Groovy S900' ),
+			'IMO X2'									=> array( 'IMO', 'Normandy X2' ),
+			'IMO X2 NORMANDY'							=> array( 'IMO', 'Normandy X2' ),
 			'M009F'										=> array( 'Infotmic', 'M009F' ),
+			'INHON PAPILIO G1'							=> array( 'Inhon', 'Papilio G1' ),
+			'innos i6'									=> array( 'Innos', 'i6' ),
 			'AZ210A'									=> array( 'Intel', 'AZ210A' ),
 			'AZ210B'									=> array( 'Intel', 'AZ210B' ),
 			'AZ510'										=> array( 'Intel', 'AZ510' ),
 			'BT210'										=> array( 'Intel', 'BT210' ),
+			'BT230'										=> array( 'Intel', 'BT230' ),
 			'BT510'										=> array( 'Intel', 'BT510' ),
 			'greenridge'								=> array( 'Intel', 'Green Ridge', TYPE_TABLET ),
 			'INQ Cloud Touch'							=> array( 'INQ', 'Cloud Touch' ),
 			'NS-13T001'									=> array( 'Insignia', 'Flex Tablet', TYPE_TABLET ),
+			'IPRO i5S'									=> array( 'IPRO', 'i5S' ),
 			'ILT-MX100'									=> array( 'iRiver', 'Tab', TYPE_TABLET ),
-			'IVIO_DE38'									=> array( 'Ivio', 'DE38' ),
+			'IVIO DE38'									=> array( 'Ivio', 'DE38' ),
+			'iwoo i900'									=> array( 'iwoo', 'i900' ),
+			'JY-G1'										=> array( 'Jiayu', 'G1' ),
 			'JY-G2'										=> array( 'Jiayu', 'G2' ),
 			'JY-G2L'									=> array( 'Jiayu', 'G2' ),
+			'Jiayu G2'									=> array( 'Jiayu', 'G2' ),
+			'Jiayu G2s'									=> array( 'Jiayu', 'G2' ),
 			'JY-G3'										=> array( 'Jiayu', 'G3' ),
+			'Jiayu G3'									=> array( 'Jiayu', 'G3' ),
 			'JT-Smart PC01'								=> array( 'Joy-IT', 'JT-Smart PC-01' ),
 			'JXD S601WIFI'								=> array( 'JXD', 'S601 WIFI', 'media' ),
+			'JXD V5200'									=> array( 'JXD', 'V5200', 'media' ),
 			'A2'										=> array( 'KakaTech', 'A2' ),
-			'Karbonn A21'								=> array( 'Karbonn', 'A21' ),
+			'Karbonn A1'								=> array( 'Karbonn', 'A1' ),
+			'Karbonn A2'								=> array( 'Karbonn', 'A2' ),
+			'Karbonn A9+'								=> array( 'Karbonn', 'A9+' ),
+			'A11'										=> array( 'Karbonn', 'A11' ),
+			'Karbonn A18'								=> array( 'Karbonn', 'A18' ),
+			'Karbonn A21!'								=> array( 'Karbonn', 'A21' ),
+			'A21'										=> array( 'Karbonn', 'A21' ),
+			'Karbonn A30'								=> array( 'Karbonn', 'A30' ),
+			'SmartTab1'									=> array( 'Karbonn', 'Smart Tab 1', TYPE_TABLET ),
 			'ST10'										=> array( 'Karbonn', 'Smart Tab 10 Cosmic', TYPE_TABLET ),
 			'D91'										=> array( 'KK', 'D91', TYPE_TABLET ),
 			'K080'										=> array( 'Kobo', 'K080', TYPE_EREADER ),
 			'W990'										=> array( 'Konka', 'W990' ),
 			'A106'										=> array( 'koobee', 'A160' ),
+			'Koobe S7 Easy tablet'						=> array( 'Koobe', 'S7 Easy tablet', TYPE_TABLET ),
 			'KPT A9'									=> array( 'KPT', 'A9' ),
 			'EV-S100'									=> array( 'Kttech', 'Take EV-S100' ),
 			'KM-E100'									=> array( 'Kttech', 'Take LTE KM-E100' ),
 			'KM-S120'									=> array( 'Kttech', 'Take 2 KM-S120' ),
 			'KM-S200'									=> array( 'Kttech', 'Take Janus KM-S200' ),
 			'KM-S220'									=> array( 'Kttech', 'Take Tachy KM-S220' ),
+			'KM-S300'									=> array( 'Kttech', 'Take HD KM-S300' ),
 			'Kyobo mirasol eReader'						=> array( 'Kyobo', 'eReader', TYPE_EREADER ),
 			'ISW11K'									=> array( 'Kyocera', 'Digno' ),
 			'KYL21'										=> array( 'Kyocera', 'Digno S' ),
+			'WX04K'										=> array( 'Kyocera', 'Digno Duo' ),
 			'JC-KSP8000'								=> array( 'Kyocera', 'Echo' ),
 			'KSP8000'									=> array( 'Kyocera', 'Echo' ),
+			'Rise'										=> array( 'Kyocera', 'Rise' ),
 			'Zio'										=> array( 'Kyocera', 'Zio' ),
 			'C5155'										=> array( 'Kyocera', 'C5155' ),
 			'C5170'										=> array( 'Kyocera', 'C5170' ),
 			'M9300'										=> array( 'Kyocera', 'M9300' ),
 			'K-Touch E619'								=> array( 'K-Touch', 'E619' ),
 			'E800'										=> array( 'K-Touch', 'E800' ),
+			'K-Touch E806'								=> array( 'K-Touch', 'E806' ),
 			'K-TouchT580'								=> array( 'K-Touch', 'T580' ),
 			'K-Touch T619'								=> array( 'K-Touch', 'T619' ),
 			'K-Touch U6'								=> array( 'K-Touch', 'U6' ),
 			'K-Touch U10'								=> array( 'K-Touch', 'U10' ),
+			'K-Touch U86'								=> array( 'K-Touch', 'U86' ),
 			'K-Touch V8'								=> array( 'K-Touch', 'V8' ),
 			'K-Touch V9'								=> array( 'K-Touch', 'V9' ),
 			'W606'										=> array( 'K-Touch', 'W606' ),
@@ -1035,130 +1351,173 @@ class DeviceModels {
 			'K-Touch W621'								=> array( 'K-Touch', 'W621' ),
 			'K-Touch W650'								=> array( 'K-Touch', 'W650' ),
 			'K-Touch W658'								=> array( 'K-Touch', 'W658' ),
+			'W686'										=> array( 'K-Touch', 'W686' ),
 			'K-Touch W688'								=> array( 'K-Touch', 'W688' ),
 			'W700'										=> array( 'K-Touch', 'W700' ),
 			'K-Touch W719'								=> array( 'K-Touch', 'W719' ),
 			'W732'										=> array( 'K-Touch', 'W732' ),
 			'K-Touch W760'								=> array( 'K-Touch', 'W760' ),
+			'K-Touch W780'								=> array( 'K-Touch', 'W780' ),
 			'W800'										=> array( 'K-Touch', 'W800' ),
 			'K-Touch W806!'								=> array( 'K-Touch', 'W806' ),
 			'W806'										=> array( 'K-Touch', 'W806' ),
 			'W808'										=> array( 'K-Touch', 'W808' ),
 			'W810'										=> array( 'K-Touch', 'W810' ),
 			'W880'										=> array( 'K-Touch', 'W880' ),
+			'LAVA S12'									=> array( 'Lava', 'S12' ),
 			'XOLO A700'									=> array( 'Lava', 'XOLO A700' ),
 			'XOLO A800'									=> array( 'Lava', 'XOLO A800' ),
+			'XOLO A1000'								=> array( 'Lava', 'XOLO A1000' ),
+			'XOLO Q800'									=> array( 'Lava', 'XOLO Q800' ),
 			'Xolo X500'									=> array( 'Lava', 'XOLO X500' ),
 			'X900'										=> array( 'Lava', 'XOLO X900' ),
 			'Xolo X900'									=> array( 'Lava', 'XOLO X900' ),
+			'XOLO X1000'								=> array( 'Lava', 'XOLO X1000' ),
+			'leepoo i500'								=> array( 'Leepoo', 'i500' ),
+			'leepoo i600'								=> array( 'Leepoo', 'i600' ),
 			'LENCM900HZ'								=> array( 'Lenco', 'TAB 811', TYPE_TABLET ),
+			'Lenco TAB-1014'							=> array( 'Lenco', 'TAB 1014', TYPE_TABLET ),
 			'ThinkPad( Tablet)?!'						=> array( 'Lenovo', 'ThinkPad Tablet', TYPE_TABLET ),
+			'Lenovo A1-32AB0'							=> array( 'Lenovo', 'IdeaPad A1', TYPE_TABLET ),
 			'(Ideapad )?K1!'							=> array( 'Lenovo', 'IdeaPad K1', TYPE_TABLET ),
 			'Ideapad S10-3T'							=> array( 'Lenovo', 'IdeaPad S10-3T', TYPE_TABLET ),
-			'S2005A-H'									=> array( 'Lenovo', 'S2005A' ),
-			'IdeaTab ?A2107(A-F|A-H)!'					=> array( 'Lenovo', 'IdeaTab A2107A', TYPE_TABLET ),
-			'IdeaTab ?A2109(A)!'						=> array( 'Lenovo', 'IdeaTab A2109A', TYPE_TABLET ),
-			'IdeaTab ?A2207(A-H)!'						=> array( 'Lenovo', 'IdeaTab A2207A', TYPE_TABLET ),
-			'IdeaTab ?K2110(A-F)!'						=> array( 'Lenovo', 'IdeaTab K2110A', TYPE_TABLET ),
-			'IdeaTab ?S2007(A-D)!'						=> array( 'Lenovo', 'IdeaTab S2007A', TYPE_TABLET ),
-			'IdeaTab ?S2109(A-F)!'						=> array( 'Lenovo', 'IdeaTab S2109A', TYPE_TABLET ),
-			'IdeaTab ?V2007(A|A-D-I)!'					=> array( 'Lenovo', 'IdeaTab V2007A', TYPE_TABLET ),
-			'IdeaTab ?V2010(A)!'						=> array( 'Lenovo', 'IdeaTab V2010A', TYPE_TABLET ),
+			'IdeaTab ?A1000-T!'							=> array( 'Lenovo', 'IdeaTab A1000', TYPE_TABLET ),
+			'IdeaTab ?A1107!'							=> array( 'Lenovo', 'IdeaTab A1107', TYPE_TABLET ),
+			'IdeaTab ?A2107(A-F|A-H)!'					=> array( 'Lenovo', 'IdeaTab A2107', TYPE_TABLET ),
+			'A2107A-H'									=> array( 'Lenovo', 'IdeaTab A2107', TYPE_TABLET ),
+			'IdeaTab ?A2109(A)!'						=> array( 'Lenovo', 'IdeaTab A2109', TYPE_TABLET ),
+			'IdeaTab ?A2207(A-H)!'						=> array( 'Lenovo', 'IdeaTab A2207', TYPE_TABLET ),
+			'IdeaTab ?A3000-H!'							=> array( 'Lenovo', 'IdeaTab A3000', TYPE_TABLET ),
+			'IdeaTab ?K2110(A-F)!'						=> array( 'Lenovo', 'IdeaTab K2110', TYPE_TABLET ),
+			'S2005A-H'									=> array( 'Lenovo', 'IdeaTab S2005', TYPE_TABLET ),
+			'IdeaTab ?S2007(A-D)!'						=> array( 'Lenovo', 'IdeaTab S2007', TYPE_TABLET ),
+			'IdeaTab ?S2010(A-D)!'						=> array( 'Lenovo', 'IdeaTab S2010', TYPE_TABLET ),
+			'IdeaTab ?S2109(A-F)!'						=> array( 'Lenovo', 'IdeaTab S2109', TYPE_TABLET ),
+			'IdeaTab ?S2110(AH)!'						=> array( 'Lenovo', 'IdeaTab S2110', TYPE_TABLET ),
+			'IdeaTab ?S6000-(F|H)!'							=> array( 'Lenovo', 'IdeaTab S6000', TYPE_TABLET ),
+			'IdeaTab ?V2007(A|A-D-I)!'					=> array( 'Lenovo', 'IdeaTab V2007', TYPE_TABLET ),
+			'IdeaTab ?V2010(A)!'						=> array( 'Lenovo', 'IdeaTab V2010', TYPE_TABLET ),
 			'A1 07'										=> array( 'Lenovo', 'LePad', TYPE_TABLET ),
 			'lepad 001b'								=> array( 'Lenovo', 'LePad', TYPE_TABLET ),
 			'lepad 001n'								=> array( 'Lenovo', 'LePad', TYPE_TABLET ),
 			'(Lenovo )?3GC101!'							=> array( 'Lenovo', 'LePhone 3GC101' ),
 			'(Lenovo |Lephone )?3GW100!'				=> array( 'Lenovo', 'LePhone 3GW100' ),
 			'(Lenovo |Lephone )?3GW101!'				=> array( 'Lenovo', 'LePhone 3GW101' ),
-			'Lenovo A1-32AB0'							=> array( 'Lenovo', 'LePhone A1-32AB0' ),
-			'Lenovo S1-37AH0'							=> array( 'Lenovo', 'LePhone S1-37AH0' ),
-			'S1 37AHO'									=> array( 'Lenovo', 'LePhone S1-37AH0' ),
-			'Lenovo S2-38AH0'							=> array( 'Lenovo', 'LePhone S2-38AH0' ),
-			'Lenovo S2-38AT0'							=> array( 'Lenovo', 'LePhone S2-38AT0' ),
-			'Lenovo A288t'								=> array( 'Lenovo', 'LePhone A288' ),
-			'Lenovo A300'								=> array( 'Lenovo', 'LePhone A300' ),
-			'Lenovo A326'								=> array( 'Lenovo', 'LePhone A326' ),
-			'Lenovo A365e'								=> array( 'Lenovo', 'LePhone A365' ),
-			'Lenovo A366t'								=> array( 'Lenovo', 'LePhone A366' ),
-			'Lenovo A390e'								=> array( 'Lenovo', 'LePhone A390' ),
-			'Lenovo A500'								=> array( 'Lenovo', 'LePhone A500' ),
-			'Lenovo A520!'								=> array( 'Lenovo', 'LePhone A520' ),
-			'Lenovo A560e'								=> array( 'Lenovo', 'LePhone A560' ),
-			'Lenovo A580'								=> array( 'Lenovo', 'LePhone A580' ),
-			'Lenovo A586'								=> array( 'Lenovo', 'LePhone A586' ),
-			'Lenovo A630'								=> array( 'Lenovo', 'LePhone A630' ),
-			'Lenovo A660'								=> array( 'Lenovo', 'LePhone A660' ),
-			'Lenovo A690'								=> array( 'Lenovo', 'LePhone A690' ),
-			'Lenovo A668t'								=> array( 'Lenovo', 'LePhone A668' ),
-			'Lenovo A698t'								=> array( 'Lenovo', 'LePhone A698' ),
-			'Lenovo A700e'								=> array( 'Lenovo', 'LePhone A700' ),
-			'Lenovo A710e'								=> array( 'Lenovo', 'LePhone A710' ),
-			'Lenovo A750'								=> array( 'Lenovo', 'LePhone A750' ),
-			'Lenovo A780'								=> array( 'Lenovo', 'LePhone A780' ),
-			'Lenovo A789'								=> array( 'Lenovo', 'LePhone A789' ),
-			'Lenovo A790e'								=> array( 'Lenovo', 'LePhone A790' ),
-			'Lenovo A798t'								=> array( 'Lenovo', 'LePhone A798' ),
-			'Lenovo K860'								=> array( 'Lenovo', 'LePhone K860' ),
-			'Lenovo P70'								=> array( 'Lenovo', 'LePhone P70' ),
-			'Lenovo P700!'								=> array( 'Lenovo', 'LePhone P700' ),
+			'(Lenovo )?S1[- ]37AH0!'					=> array( 'Lenovo', 'LePhone S1' ),
+			'(Lenovo )?S2[- ]38A(H0|T0)!'				=> array( 'Lenovo', 'LePhone S2' ),
+			'lephone 1800'								=> array( 'Lenovo', 'LePhone 1800' ),
+			'A30t'										=> array( 'Lenovo', 'A30' ),
+			'Lenovo A60+?!'								=> array( 'Lenovo', 'A60' ),
+			'Lenovo A65'								=> array( 'Lenovo', 'A65' ),
+			'Lenovo A66t'								=> array( 'Lenovo', 'A66' ),
+			'Lenovo A68e'								=> array( 'Lenovo', 'A68' ),
+			'Lenovo A278t'								=> array( 'Lenovo', 'A278' ),
+			'Lenovo A288t'								=> array( 'Lenovo', 'A288' ),
+			'Lenovo A298t'								=> array( 'Lenovo', 'A298' ),
+			'Lenovo A300'								=> array( 'Lenovo', 'A300' ),
+			'Lenovo A326'								=> array( 'Lenovo', 'A326' ),
+			'Lenovo A356'								=> array( 'Lenovo', 'A356' ),
+			'Lenovo A365e'								=> array( 'Lenovo', 'A365' ),
+			'Lenovo A366t'								=> array( 'Lenovo', 'A366' ),
+			'Lenovo A370e'								=> array( 'Lenovo', 'A370' ),
+			'Lenovo A390!'								=> array( 'Lenovo', 'A390' ),
+			'Lenovo A500'								=> array( 'Lenovo', 'A500' ),
+			'Lenovo A520!'								=> array( 'Lenovo', 'A520' ),
+			'Lenovo A530'								=> array( 'Lenovo', 'A530' ),
+			'Lenovo A560e'								=> array( 'Lenovo', 'A560' ),
+			'Lenovo A580'								=> array( 'Lenovo', 'A580' ),
+			'Lenovo A586'								=> array( 'Lenovo', 'A586' ),
+			'Lenovo A630!'								=> array( 'Lenovo', 'A630' ),
+			'Lenovo A660'								=> array( 'Lenovo', 'A660' ),
+			'Lenovo A690'								=> array( 'Lenovo', 'A690' ),
+			'Lenovo A668t'								=> array( 'Lenovo', 'A668' ),
+			'Lenovo A698t'								=> array( 'Lenovo', 'A698' ),
+			'Lenovo A700e'								=> array( 'Lenovo', 'A700' ),
+			'Lenovo A710e'								=> array( 'Lenovo', 'A710' ),
+			'Lenovo A750'								=> array( 'Lenovo', 'A750' ),
+			'A750'										=> array( 'Lenovo', 'A750' ),	
+			'Lenovo A765!'								=> array( 'Lenovo', 'A765' ),	
+			'Lenovo A780'								=> array( 'Lenovo', 'A780' ),
+			'Lenovo A789'								=> array( 'Lenovo', 'A789' ),
+			'Lenovo A790e'								=> array( 'Lenovo', 'A790' ),
+			'Lenovo A798t'								=> array( 'Lenovo', 'A798' ),
+			'Lenovo A800'								=> array( 'Lenovo', 'A800' ),
+			'Lenovo A820!'								=> array( 'Lenovo', 'A820' ),
+			'Lenovo K800'								=> array( 'Lenovo', 'K800' ),
+			'Lenovo K860!'								=> array( 'Lenovo', 'K860' ),
+			'Lenovo P70'								=> array( 'Lenovo', 'P70' ),
+			'Lenovo P700!'								=> array( 'Lenovo', 'P700' ),
+			'Lenovo P770'								=> array( 'Lenovo', 'P770' ),
 			'Lenovo S560'								=> array( 'Lenovo', 'S560' ),
 			'Lenovo S680'								=> array( 'Lenovo', 'S680' ),
+			'Lenovo S686'								=> array( 'Lenovo', 'S686' ),
 			'Lenovo S720'								=> array( 'Lenovo', 'S720' ),
 			'S720i'										=> array( 'Lenovo', 'S720' ),
+			'Lenovo S760'								=> array( 'Lenovo', 'S760' ),
 			'Lenovo S850e'								=> array( 'Lenovo', 'S850' ),
-			'Lenovo S880'								=> array( 'Lenovo', 'S880' ),
+			'Lenovo S870e'								=> array( 'Lenovo', 'S870' ),
+			'Lenovo S880!'								=> array( 'Lenovo', 'S880' ),
+			'Lenovo S890'								=> array( 'Lenovo', 'S890' ),
 			'Lenovo ?S899!'								=> array( 'Lenovo', 'S899' ),
-			'A30t'										=> array( 'Lenovo', 'A30t' ),
-			'Lenovo A60+?!'								=> array( 'Lenovo', 'A60' ),
-			'Lenovo A65'								=> array( 'Lenovo', 'A65' ),
-			'Lenovo A66t'								=> array( 'Lenovo', 'A66t' ),
-			'Lenovo A68e'								=> array( 'Lenovo', 'A68e' ),
-			'Lenovo K800'								=> array( 'Lenovo', 'K800' ),
-			'Lenovo K860i'								=> array( 'Lenovo', 'K860' ),
+			'Lenovo S920'								=> array( 'Lenovo', 'S920' ),
+			'ideatv A21'								=> array( 'Lenovo', 'IDEA TV', TYPE_TELEVISION ),
 			'IDEA TV T100'								=> array( 'Lenovo', 'IDEA TV', TYPE_TELEVISION ),
 			'IDEA TV K91'								=> array( 'Lenovo', 'IDEA TV', TYPE_TELEVISION ),
 			'TC970'										=> array( 'Le Pan', 'TC970', TYPE_TABLET ),
 			'LePanII'									=> array( 'Le Pan', 'II', TYPE_TABLET ),
+			'Le Pan S'									=> array( 'Le Pan', 'S', TYPE_TABLET ),
 			'LG-C5(50|55)!'								=> array( 'LG', 'Optimus Chat' ),
 			'LG-C660!'									=> array( 'LG', 'Optimus Pro' ),
 			'LG-C710!'									=> array( 'LG', 'Aloha' ),
 			'LG-C729'									=> array( 'LG', 'DoublePlay' ),
 			'LG-C800G'									=> array( 'LG', 'Eclypse' ),
 			'LG-CX670'									=> array( 'LG', 'Optimus 3G' ),
+			'LG-D500'									=> array( 'LG', 'D500' ),
+			'LG-D700'									=> array( 'LG', 'D700' ),
+			'LG-D801'									=> array( 'LG', 'D801' ),
 			'LG-E400!'									=> array( 'LG', 'Optimus L3' ),
 			'LG-E405!'									=> array( 'LG', 'Optimus L3 Dual' ),
+			'LG-E410!'									=> array( 'LG', 'Optimus L3' ),
 			'LG-E425!'									=> array( 'LG', 'E425' ),
-			'LG-E430!'									=> array( 'LG', 'E430' ),
-			'LG-E435!'									=> array( 'LG', 'E435' ),
+			'LG-E430!'									=> array( 'LG', 'Optimus L3 II' ),
+			'LG-E435!'									=> array( 'LG', 'Optimus L3 II Dual' ),
+			'LG-E440!'									=> array( 'LG', 'E440' ),
 			'LG-E445!'									=> array( 'LG', 'E445' ),
-			'LG-E450!'									=> array( 'LG', 'E450' ),
-			'LG-E455!'									=> array( 'LG', 'E455' ),
+			'LG-E450!'									=> array( 'LG', 'Optimus L5 II' ),
+			'LG-E455!'									=> array( 'LG', 'Optimus L5 II Dual' ),
 			'LG-E460!'									=> array( 'LG', 'E460' ),
+			'LG-E470!'									=> array( 'LG', 'E470' ),
 			'LG-E510!'									=> array( 'LG', 'Optimus Hub' ),
 			'LG-E6(10|12|17)!'							=> array( 'LG', 'Optimus L5' ),
 			'LG-E615!'									=> array( 'LG', 'Optimus L5 Dual' ),
 			'LG-E720!'									=> array( 'LG', 'Optimus Chic' ),
-			'LG-E730'									=> array( 'LG', 'Optimus Sol' ),
+			'LG-E730!'									=> array( 'LG', 'Optimus Sol' ),
+			'LG-E940'									=> array( 'LG', 'Optimus G Pro' ),
 			'LG-E960'									=> array( 'LG', 'Nexus 4' ),
 			'LG-E9(70|71|73|75|76|77|78)!'				=> array( 'LG', 'Optimus G' ),
-			'LG-E980!'									=> array( 'LG', 'Optimus G2' ),
+			'LG-E980!'									=> array( 'LG', 'E980' ),
+			'LG-E988'									=> array( 'LG', 'E988' ),
 			'LG-F100!'									=> array( 'LG', 'Optimus Vu' ),
 			'LG-F120!'									=> array( 'LG', 'Optimus LTE Tag' ),
 			'LG-F160!'									=> array( 'LG', 'Optimus LTE II' ),
 			'LG-F180!'									=> array( 'LG', 'Optimus G' ),
 			'LG-F200!'									=> array( 'LG', 'Optimus Vu 2' ),
-			'LG-F240!'									=> array( 'LG', 'F240' ),
+			'LG-F240!'									=> array( 'LG', 'Optimus G Pro' ),
 			'LG-F260!'									=> array( 'LG', 'F260' ),
+			'LG-F320!'									=> array( 'LG', 'F320' ),
 			'LG-GT540!'									=> array( 'LG', 'Optimus' ),
 			'LG-GW620'									=> array( 'LG', 'GW620 Eve' ),
 			'LG-KH5200'									=> array( 'LG', 'Andro-1' ),
 			'LG-KU3700'									=> array( 'LG', 'Optimus One' ),
 			'LG-KU5400'									=> array( 'LG', 'PRADA 3.0' ),
 			'LG-KU5900'									=> array( 'LG', 'Optimus Black' ),
+			'LG-L25L'									=> array( 'LG', 'L25L' ),
+			'LG-L38C'									=> array( 'LG', 'Optimus Dynamic' ),
 			'LG-L40G'									=> array( 'LG', 'L40G' ),
 			'LG-L160L'									=> array( 'LG', 'L160L' ),
 			'LG-LG730'									=> array( 'LG', 'Venice' ),
 			'LG-LG855'									=> array( 'LG', 'Marquee' ),
+			'LG-LG870'									=> array( 'LG', 'LG870' ),
 			'LG-LS670'									=> array( 'LG', 'Optimus S' ),
 			'LG-LS696'									=> array( 'LG', 'Elite' ),
 			'LG-LS720'									=> array( 'LG', 'LS720' ),
@@ -1177,6 +1536,7 @@ class DeviceModels {
 			'LG-LW690'									=> array( 'LG', 'Optimus C' ),
 			'LG-LW770'									=> array( 'LG', 'Regard' ),
 			'LG-MS690'									=> array( 'LG', 'Optimus M' ),
+			'LGMS769'									=> array( 'LG', 'MS769' ),
 			'LG-MS770'									=> array( 'LG', 'Motion 4G' ),
 			'LG-MS790'									=> array( 'LG', 'MS790' ),
 			'LG-MS840'									=> array( 'LG', 'Connect 4G' ),
@@ -1189,12 +1549,13 @@ class DeviceModels {
 			'LG-P505!'									=> array( 'LG', 'Phoenix' ),
 			'LG-P506'									=> array( 'LG', 'Thrive' ),
 			'LG-P509'									=> array( 'LG', 'Optimus T' ),
+			'LG-P659'									=> array( 'LG', 'P659' ),
 			'LG-P6(90|98)!'								=> array( 'LG', 'Optimus Net' ),
 			'LG-P693!'									=> array( 'LG', 'P693' ),
 			'LG-P698!'									=> array( 'LG', 'Optimus Net Dual' ),
 			'LG-P7(00|05|08)!'							=> array( 'LG', 'Optimus L7' ),
-			'LG-P710!'									=> array( 'LG', 'P710' ),
-			'LG-P715!'									=> array( 'LG', 'P715' ),
+			'LG-P710!'									=> array( 'LG', 'Optimus L7 II' ),
+			'LG-P715!'									=> array( 'LG', 'Optimus L7 II Dual' ),
 			'LG-P720!'									=> array( 'LG', 'Optimus Chic' ),
 			'LG-P725'									=> array( 'LG', 'Optimus 3D Max' ),
 			'LG-P7(60|65|68|69)!'						=> array( 'LG', 'Optimus L9' ),
@@ -1225,6 +1586,7 @@ class DeviceModels {
 			'LG-VM670'									=> array( 'LG', 'Optimus V' ),
 			'LG-VM696'									=> array( 'LG', 'Optimus Elite' ),
 			'LG-VM701'									=> array( 'LG', 'Optimus Slider' ),
+			'LG-VS410!'									=> array( 'LG', 'VS410' ),
 			'LG-VS660'									=> array( 'LG', 'Vortex' ),
 			'LG-VS700'									=> array( 'LG', 'Enlighten' ),
 			'LG-VS740'									=> array( 'LG', 'Ally' ),
@@ -1239,7 +1601,7 @@ class DeviceModels {
 			'GT540'										=> array( 'LG', 'Optimus GT540' ),
 			'GW620'										=> array( 'LG', 'Eve' ),
 			'KU9500'									=> array( 'LG', 'Optimus Z' ),
-			'LGC660'									=> array( 'LG', 'Optimus Pro' ),
+			'LGC660!'									=> array( 'LG', 'Optimus Pro' ),
 			'LGL21'										=> array( 'LG', 'Optimus G' ),
 			'LGL45C'									=> array( 'LG', 'Optimus Net' ),
 			'LGL55C'									=> array( 'LG', 'Optimus Q' ),
@@ -1262,7 +1624,9 @@ class DeviceModels {
 			'L-02D'										=> array( 'LG', 'PRADA phone' ),
 			'L-02E'										=> array( 'LG', 'Optimus LIFE' ),
 			'L-04C'										=> array( 'LG', 'Optimus Chat' ),
+			'L-04E'										=> array( 'LG', 'Optimus G Pro' ),
 			'L-05D'										=> array( 'LG', 'Optimus it' ),
+			'L-05E'										=> array( 'LG', 'L-05E' ),
 			'L-06C'										=> array( 'LG', 'Optimus Pad', TYPE_TABLET ),
 			'L-06D'										=> array( 'LG', 'Optimus Vu' ),
 			'L-07C'										=> array( 'LG', 'Optimus Bright' ),
@@ -1272,8 +1636,12 @@ class DeviceModels {
 			'LG-GT540 Optimus'							=> array( 'LG', 'Optimus' ),
 			'LG-Optimus Black'							=> array( 'LG', 'Optimus Black' ),
 			'LG-Optimus V'								=> array( 'LG', 'Optimus V' ),
+			'LG-OPTIMUS HD LTE'							=> array( 'LG', 'Optimus HD' ),
+			'LG-OPTIMUS LTE HD'							=> array( 'LG', 'Optimus HD' ),
 			'Ally'										=> array( 'LG', 'Ally' ),
 			'Optimus'									=> array( 'LG', 'Optimus' ),
+			'OptimusBlack'								=> array( 'LG', 'Optimus Black' ),
+			'Optimus G'									=> array( 'LG', 'Optimus G' ),
 			'Optimus Me'								=> array( 'LG', 'Optimus Me' ),
 			'optimus me p350'							=> array( 'LG', 'Optimus Me' ),
 			'Optimus 2X'								=> array( 'LG', 'Optimus 2X' ),
@@ -1281,25 +1649,35 @@ class DeviceModels {
 			'IS11LG'									=> array( 'LG', 'Optimus X' ),
 			'Vortex'									=> array( 'LG', 'Vortex' ),
 			'LDK-ICK v1.4'								=> array( 'LG', 'Esteem' ),
+			'Prada 3.0'									=> array( 'LG', 'PRADA 3.0' ),
+			'LG-Google TV'								=> array( 'LG', 'Google TV', TYPE_TELEVISION, FLAG_GOOGLETV ),
 			'T6'										=> array( 'Malata', 'Zpad T6', TYPE_TABLET ),
 			'Malata SMBA1002'							=> array( 'Malata', 'Tablet SMB-A1002', TYPE_TABLET ),
 			'MID05V2'									=> array( 'Manta', 'Powertab MID05V2', TYPE_TABLET ),
+			'MID801'									=> array( 'Manta', 'MID801 Duo Power HD', TYPE_TABLET ),
 			'M-270'										=> array( 'Maylong', 'M-270', TYPE_TABLET ),
+			'M70'										=> array( 'Maxsun', 'M70', TYPE_TABLET ),
 			'MP705C'									=> array( 'Mediacom', 'SmartPad 705c', TYPE_TABLET ),
 			'STM712HCZ'									=> array( 'Mediacom', 'SmartPad 712c', TYPE_TABLET ),
 			'STM803HC'									=> array( 'Mediacom', 'SmartPad 810c', TYPE_TABLET ),
 			'Mediacom 810C'								=> array( 'Mediacom', 'SmartPad 810c', TYPE_TABLET ),
 			'Xteam Smartpad 810c'						=> array( 'Mediacom', 'SmartPad 810c', TYPE_TABLET ),
+			'Xteam 4.8 Smartpad 810c'					=> array( 'Mediacom', 'SmartPad 810c', TYPE_TABLET ),
 			'SmartPad810c'								=> array( 'Mediacom', 'SmartPad 810c', TYPE_TABLET ),
 			'MP810C'									=> array( 'Mediacom', 'SmartPad 810c', TYPE_TABLET ),
+			'M-MP855i'									=> array( 'Mediacom', 'SmartPad 855i', TYPE_TABLET ),
+			'SmartPad870'								=> array( 'Mediacom', 'SmartPad 870 S2', TYPE_TABLET ),
 			'M-MP875S2'									=> array( 'Mediacom', 'SmartPad 875 S2', TYPE_TABLET ),
 			'MP907C'									=> array( 'Mediacom', 'SmartPad 907c', TYPE_TABLET ),
 			'932i'										=> array( 'Mediacom', 'SmartPad 932i', TYPE_TABLET ),
+			'SmartPad970s2'								=> array( 'Mediacom', 'SmartPad 970 S2', TYPE_TABLET ),
+			'SmartPad1010i'								=> array( 'Mediacom', 'SmartPad 1010i', TYPE_TABLET ),
 			'MT7003'									=> array( 'Mediadroid', 'Imperius' ),
 			'MTK6516'									=> array( 'Mediatek', 'MTK6516' ),
 			'LIFETAB S9512'								=> array( 'Medion', 'Lifetab S9512', TYPE_TABLET ),
 			'LIFETAB P9514'								=> array( 'Medion', 'Lifetab P9514', TYPE_TABLET ),
 			'MD LIFETAB P9516'							=> array( 'Medion', 'Lifetab P9516', TYPE_TABLET ),
+			'MEDION Smartphone LIFE E3501'				=> array( 'Medion', 'Life E3501' ),
 			'MEDION LIFE P4012'							=> array( 'Medion', 'Life P4012' ),
 			'MEDION LIFE P4310'							=> array( 'Medion', 'Life P4310' ),
 			'M8'										=> array( 'Meizu', 'M8' ),
@@ -1312,10 +1690,14 @@ class DeviceModels {
 			'M032'										=> array( 'Meizu', 'MX M032' ),
 			'M040'										=> array( 'Meizu', 'M040' ),
 			'Slidepad'									=> array( 'Memup', 'Slidepad', TYPE_TABLET ),
+			'SP-A20i'									=> array( 'Мегафон', 'SP-A20i Mint' ),
+			'Micromax A25'								=> array( 'Micromax', 'A25 Smarty' ),
 			'Micromax A44'								=> array( 'Micromax', 'A44 Punk' ),
 			'A45'										=> array( 'Micromax', 'A45 Punk' ),
 			'Micromax A50'								=> array( 'Micromax', 'A50 Ninja' ),
 			'Micromax A52'								=> array( 'Micromax', 'A52 Aisha' ),
+			'A52'										=> array( 'Micromax', 'A52 Aisha' ),
+			'Micromax-Xzoom A52'						=> array( 'Micromax', 'A52 Aisha' ),
 			'Micromax A56'								=> array( 'Micromax', 'A56 Ninja 2' ),
 			'Micromax A57'								=> array( 'Micromax', 'A57 Ninja 3' ),
 			'Micromax A60'								=> array( 'Micromax', 'Andro A60' ),
@@ -1327,16 +1709,30 @@ class DeviceModels {
 			'Micromax A80'								=> array( 'Micromax', 'A80 Infinity' ),
 			'Micromax A84'								=> array( 'Micromax', 'A84' ),
 			'Micromax A85'								=> array( 'Micromax', 'A85' ),
-			'Micromax A87'								=> array( 'Micromax', 'A87 Ninja 4' ),
+			'Micromax A87!'								=> array( 'Micromax', 'A87 Ninja 4' ),
+			'Micromax A89'								=> array( 'Micromax', 'A89 Ninja' ),
 			'Micromax A90!'								=> array( 'Micromax', 'A90 Pixel' ),
+			'A90S'										=> array( 'Micromax', 'A90S Pixel' ),
 			'Micromax A100'								=> array( 'Micromax', 'A100 Canvas' ),
 			'Micromax A110'								=> array( 'Micromax', 'A110 Canvas 2' ),
+			'Micromax Canvas 2'							=> array( 'Micromax', 'A110 Canvas 2' ),
+			'Micromax A110 (Canvas 2)'					=> array( 'Micromax', 'A110 Canvas 2' ),
+			'Micromax A116'								=> array( 'Micromax', 'A116 Canvas HD' ),
+			'Micromax P250(Funbook)'					=> array( 'Micromax', 'Funbook Alpha P250', TYPE_TABLET ),
 			'Micromax P275'								=> array( 'Micromax', 'Funbook Infinity P275', TYPE_TABLET ),
 			'P300(Funbook)'								=> array( 'Micromax', 'Funbook P300', TYPE_TABLET ),
 			'Micromax P350'								=> array( 'Micromax', 'Funbook P350', TYPE_TABLET ),
 			'Micromax P500(Funbook)'					=> array( 'Micromax', 'Funbook Pro P500', TYPE_TABLET ),
-			'Mobiistar Touch S01'						=> array( 'Mobiistar', 'Touch S01' ),	
-			'Cynus T1'									=> array( 'Mobistel', 'Cynus T1' ),				
+			'MioPad 6'									=> array( 'Mitac', 'MioPad 6', TYPE_TABLET ),
+			'MITO A200'									=> array( 'Mito', 'A200' ),
+			'MITO A322'									=> array( 'Mito', 'A322' ),
+			'Mobiistar Touch S01'						=> array( 'Mobiistar', 'Touch S01' ),
+			'Mobiistar Touch Kem 350'					=> array( 'Mobiistar', 'Touch Kem 350' ),
+			'edenTAB ET-701'							=> array( 'Mobile In Style', 'Eden TAB ET-701', TYPE_TABLET ),	
+			'Cynus T1'									=> array( 'Mobistel', 'Cynus T1' ),	
+			'Cynus T2'									=> array( 'Mobistel', 'Cynus T2' ),			
+			'MOGU M2'									=> array( 'Mogu', 'M2' ),				
+			'MOGU M2 ROM'								=> array( 'Mogu', 'M2' ),				
 			'AT735'										=> array( 'Moinstone', 'AT735', TYPE_TABLET ),
 			'A853'										=> array( 'Motorola', 'Milestone' ),
 			'A953'										=> array( 'Motorola', 'Milestone 2' ),
@@ -1362,6 +1758,7 @@ class DeviceModels {
 			'ME501'										=> array( 'Motorola', 'CLIQ XT' ),
 			'ME511'										=> array( 'Motorola', 'FLIPOUT' ),
 			'ME525!'									=> array( 'Motorola', 'MOTO ME525' ),
+			'ME526!'									=> array( 'Motorola', 'DEFY+' ),
 			'ME600'										=> array( 'Motorola', 'BACKFLIP' ),
 			'ME632'										=> array( 'Motorola', 'PRO+' ),
 			'ME722'										=> array( 'Motorola', 'Milestone 2' ),
@@ -1371,8 +1768,10 @@ class DeviceModels {
 			'ME865'										=> array( 'Motorola', 'ATRIX 2' ),
 			'MT620!'									=> array( 'Motorola', 'MOTO MT620' ),
 			'MT716'										=> array( 'Motorola', 'MOTO MT716' ),
+			'MT788'										=> array( 'Motorola', 'RAZR i' ),
 			'MT810'										=> array( 'Motorola', 'MOTO MT810' ),
 			'MT870'										=> array( 'Motorola', 'MOTO MT870' ),
+			'MT887'										=> array( 'Motorola', 'RAZR V' ),
 			'MT917'										=> array( 'Motorola', 'MT917' ),
 			'MZ505'										=> array( 'Motorola', 'XOOM Family Edition', TYPE_TABLET ),
 			'MZ600'										=> array( 'Motorola', 'XOOM 4G LTE', TYPE_TABLET ),
@@ -1383,16 +1782,20 @@ class DeviceModels {
 			'MZ605'										=> array( 'Motorola', 'XOOM 3G', TYPE_TABLET ),
 			'MZ606'										=> array( 'Motorola', 'XOOM WiFi', TYPE_TABLET ),
 			'MZ607'										=> array( 'Motorola', 'XOOM 2 WiFi Media Edition', TYPE_TABLET ),
+			'MZ608'										=> array( 'Motorola', 'XOOM 2 3G Media Edition', TYPE_TABLET ),
 			'MZ609!'									=> array( 'Motorola', 'Droid XYBOARD 8.2', TYPE_TABLET ),
 			'MZ615'										=> array( 'Motorola', 'XOOM 2 WiFi', TYPE_TABLET ),
+			'MZ616'										=> array( 'Motorola', 'XOOM 2 3G', TYPE_TABLET ),
 			'MZ617!'									=> array( 'Motorola', 'Droid XYBOARD 10.1', TYPE_TABLET ),
 			'WX435'										=> array( 'Motorola', 'TRIUMPH WX435' ),
 			'WX445'										=> array( 'Motorola', 'CITRUS WX445' ),
 			'XT300'										=> array( 'Motorola', 'SPICE' ),
 			'XT301'										=> array( 'Motorola', 'MOTO XT301' ),
 			'XT303'										=> array( 'Motorola', 'MOTOSMART XT303' ),
+			'XT305'										=> array( 'Motorola', 'MOTOSMART XT305' ),
 			'XT311'										=> array( 'Motorola', 'FIRE' ),
 			'XT316'										=> array( 'Motorola', 'MOTO XT316' ),
+			'XT317'										=> array( 'Motorola', 'SPICE Key' ),
 			'XT319'										=> array( 'Motorola', 'MOTO XT319' ),
 			'XT3(20|21)!'								=> array( 'Motorola', 'DEFY Mini' ),
 			'XT389'										=> array( 'Motorola', 'MOTOSMART XT389' ),
@@ -1406,9 +1809,11 @@ class DeviceModels {
 			'XT536'										=> array( 'Motorola', 'DEFY Diana' ),	
 			'XT550'										=> array( 'Motorola', 'MOTOSMART MIX' ),	
 			'XT5(56|57)!'								=> array( 'Motorola', 'DEFY XT' ),	
+			'XT560'										=> array( 'Motorola', 'DEFY Pro' ),	
 			'XT603'										=> array( 'Motorola', 'ADMIRAL' ),
 			'XT605'										=> array( 'Motorola', 'XT605' ),	
 			'XT610'										=> array( 'Motorola', 'Droid Pro' ),
+			'XT611'										=> array( 'Motorola', 'MOTOSMART Flip' ),
 			'XT615'										=> array( 'Motorola', 'MOTO XT615' ),
 			'XT626'										=> array( 'Motorola', 'MOTO XT626' ),
 			'XT681'										=> array( 'Motorola', 'MOTO XT681' ),
@@ -1419,6 +1824,7 @@ class DeviceModels {
 			'XT702'										=> array( 'Motorola', 'MOTO XT702' ),
 			'XT711'										=> array( 'Motorola', 'MOTO XT711' ),
 			'XT720'										=> array( 'Motorola', 'Milestone' ),
+			'XT760'										=> array( 'Motorola', 'MOTO XT760' ),
 			'XT788'										=> array( 'Motorola', 'XT788' ),
 			'XT875'										=> array( 'Motorola', 'Droid Bionic' ),
 			'XT800W'									=> array( 'Motorola', 'MOTO Glam' ),
@@ -1433,8 +1839,11 @@ class DeviceModels {
 			'XT890'										=> array( 'Motorola', 'RAZR i' ),
 			'XT8(94|97)!'								=> array( 'Motorola', 'Droid 4' ),
 			'XT9(01|10)!'								=> array( 'Motorola', 'RAZR' ),
+			'XT905'										=> array( 'Motorola', 'RAZR M' ),
 			'XT907'										=> array( 'Motorola', 'Droid RAZR M' ),
 			'XT912!'									=> array( 'Motorola', 'Droid RAZR' ),
+			'XT918'										=> array( 'Motorola', 'XT918' ),
+			'XT920'										=> array( 'Motorola', 'XT920' ),
 			'XT9(23|25|26)!'							=> array( 'Motorola', 'Droid RAZR HD' ),
 			'XT928'										=> array( 'Motorola', 'XT928' ),
 			'201M'										=> array( 'Motorola', 'Droid RAZR M' ),
@@ -1472,48 +1881,70 @@ class DeviceModels {
 			'MotoroiX'									=> array( 'Motorola', 'Droid X' ),
 			'Moto Backflip'								=> array( 'Motorola', 'BACKFLIP' ),
 			'RAZR'										=> array( 'Motorola', 'RAZR' ),
+			'RAZR HD'									=> array( 'Motorola', 'RAZR HD' ),
+			'RAZR MAXX'									=> array( 'Motorola', 'RAZR MAXX' ),
 			'Triumph'									=> array( 'Motorola', 'TRIUMPH' ),
 			'Opus One'									=> array( 'Motorola', 'i1' ),
 			'Photon'									=> array( 'Motorola', 'PHOTON' ),
 			'Photon 4G'									=> array( 'Motorola', 'PHOTON 4G' ),
 			'XOOM'										=> array( 'Motorola', 'XOOM', TYPE_TABLET ),
+			'MOTOROLA XOOM MZ606'						=> array( 'Motorola', 'XOOM', TYPE_TABLET ),
 			'XOOM 2!'									=> array( 'Motorola', 'XOOM 2', TYPE_TABLET ),
 			'XOOM MZ606'								=> array( 'Motorola', 'XOOM WiFi', TYPE_TABLET ),
 			'ISW11M'									=> array( 'Motorola', 'PHOTON' ),
 			'IS12M'										=> array( 'Motorola', 'RAZR' ),
+			'MOTOROLA RAZR'								=> array( 'Motorola', 'RAZR' ),
 			'MOTWX435KT'								=> array( 'Motorola', 'TRIUMPH' ),
 			'X3-Ice MIUI XT720 Memorila Classics'		=> array( 'Motorola', 'Milestone' ),
-			'Enjoy 7 Plus'								=> array( 'MSI', 'WindPad Enjoy 7 Plus', TYPE_TABLET ),
+			'MC40N0'									=> array( 'Motorola', 'MC40', TYPE_POS ),
+			'Enjoy 7 Plus'								=> array( 'Multilaser', 'Vibe NB036', TYPE_TABLET ),
+			'MTS-SP100'									=> array( 'MTS', 'Lifewire SP 100' ),
+			'NB036'										=> array( 'Nabi', 'Kids tablet', TYPE_TABLET ),
+			'MyPhone A848 Duo'							=> array( 'MyPhone', 'A848 Duo' ),
 			'A878 Duo'									=> array( 'MyPhone', 'A878 Duo' ),
+			'MyPhone A888 Duo'							=> array( 'MyPhone', 'A888 Duo' ),
 			'A898 Duo'									=> array( 'MyPhone', 'A898 Duo' ),
+			'MyPhone A919 Duo'							=> array( 'MyPhone', 'A919 Duo' ),
 			'NABI-A'									=> array( 'Nabi', 'Kids tablet', TYPE_TABLET ),
 			'N1'										=> array( 'Newman', 'N1' ),
+			'Newman N2'									=> array( 'Newman', 'N2' ),
 			'Newpad'									=> array( 'Newsmy', 'Newpad', TYPE_TABLET ),
 			'Newpad-K97'								=> array( 'Newsmy', 'Newpad K97', TYPE_TABLET ),
+			'P7'										=> array( 'Newsmy', 'Newpad P7', TYPE_TABLET ),
 			'Newpad P9'									=> array( 'Newsmy', 'Newpad P9', TYPE_TABLET ),
 			'M-PAD N8'									=> array( 'Newsmy', 'M-pad N8', TYPE_TABLET ),
 			'LT-NA7'									=> array( 'NEC', 'LT-NA7' ),
 			'N-01D'										=> array( 'NEC', 'MEDIAS PP N-01D' ),
 			'N-04C'										=> array( 'NEC', 'MEDIAS N-04C' ),
 			'N-04D'										=> array( 'NEC', 'MEDIAS LTE N-04D' ),
+			'N-04E'										=> array( 'NEC', 'MEDIAS X N-04E' ),
 			'N-05D'										=> array( 'NEC', 'MEDIAS ES N-05D' ),
 			'N-06C'										=> array( 'NEC', 'MEDIAS WP N-06C' ),
 			'N-06D'										=> array( 'NEC', 'MEDIAS Tab N-06D', TYPE_TABLET ),
 			'N-07D'										=> array( 'NEC', 'MEDIAS X N-07D' ),
 			'101N'										=> array( 'NEC', 'MEDIAS CH Softbank 101N' ),
 			'IS11N'										=> array( 'NEC', 'MEDIAS BR IS11N' ),
+			'NEC-101S'									=> array( 'NEC', 'MEDIAS 101S' ),
+			'NEC-101T'									=> array( 'NEC', 'MEDIAS 101T' ),
 			'Nexian NX-A890'							=> array( 'Nexian', 'Journey' ),
 			'NX-A890'									=> array( 'Nexian', 'Journey' ),
 			'NX-A891'									=> array( 'Nexian', 'Ultra Journey' ),
+			'NX-A899'									=> array( 'Nexian', 'Xtreme' ),
 			'M726HC'									=> array( 'Nextbook', 'Premium 7', TYPE_EREADER ),
 			'Next7P12!'									=> array( 'Nextbook', 'Premium 7', TYPE_EREADER ),
 			'NXM726HN'									=> array( 'Nextbook', 'Premium 7', TYPE_EREADER ),
 			'NXM727KC!'									=> array( 'Nextbook', 'Premium 7', TYPE_EREADER ),
 			'Next8P12'									=> array( 'Nextbook', 'Premium 8', TYPE_EREADER ),
+			'NXM803HC'									=> array( 'Nextbook', 'Premium 8', TYPE_EREADER ),
 			'NXM803HD'									=> array( 'Nextbook', 'Premium 8', TYPE_EREADER ),
 			'DATAM803HC'								=> array( 'Nextbook', 'Premium 8', TYPE_EREADER ),
+			'NXM805ND'									=> array( 'Nextbook', 'Premium 8 SE', TYPE_EREADER ),
+			'DATAM819HD B'								=> array( 'Nextbook', 'Premium 8', TYPE_EREADER ),
+			'NXM908HC'									=> array( 'Nextbook', 'Premium 9', TYPE_EREADER ),
+			'NXM703U'									=> array( 'Nextbook', 'Next 2', TYPE_EREADER ),
 			'NXM901'									=> array( 'Nextbook', 'Next 3', TYPE_EREADER),
 			'NGM Vanity Smart'							=> array( 'NGM', 'Vanity Smart' ),
+			'i9430'										=> array( 'Ninetology', 'Insight i9430' ),
 			'Nokia N9'									=> array( 'Nokia', 'N9' ),
 			'Nokia N900'								=> array( 'Nokia', 'N900' ),
 			'Lumia800'									=> array( 'Nokia', 'Lumia 800' ),
@@ -1522,10 +1953,13 @@ class DeviceModels {
 			'Adam'										=> array( 'Notion Ink', 'ADAM', TYPE_TABLET ),
 			'P4D Sirius'								=> array( 'Nvsbl', 'P4D SIRIUS', TYPE_TABLET ),
 			'EFM710A'									=> array( 'Oblio', 'Mint 7x', TYPE_TABLET ),
+			'Loox'										=> array( 'Odys', 'Loox', TYPE_TABLET ),
 			'ODYS-Xpress'								=> array( 'Odys', 'Xpress', TYPE_TABLET ),
 			'Olivetti Olipad 100'						=> array( 'Olivetti', 'Olipad 100', TYPE_TABLET ),
 			'OP110'										=> array( 'Olivetti', 'Olipad 110', TYPE_TABLET ),
 			'ONDA MID'									=> array( 'Onda', 'MID', TYPE_TABLET ),
+			'V812 Core4'								=> array( 'Onda', 'V812 Quad Core', TYPE_TABLET ),
+			'V972 Core4'								=> array( 'Onda', 'V972 Quad Core', TYPE_TABLET ),
 			'VX580A'									=> array( 'Onda', 'VX580A', TYPE_TABLET ),
 			'VX610A'									=> array( 'Onda', 'VX610A', TYPE_TABLET ),
 			'TQ150'										=> array( 'Onda', 'TQ150' ),
@@ -1537,20 +1971,26 @@ class DeviceModels {
 			'OPPOX905'									=> array( 'Oppo', 'Find 3 X905' ),
 			'X907'										=> array( 'Oppo', 'Finder X907' ),
 			'OPPOX907'									=> array( 'Oppo', 'Finder X907' ),
+			'X909'										=> array( 'Oppo', 'Find 5 X909' ),
 			'X9015'										=> array( 'Oppo', 'Find X9015' ),
 			'OPPOX9015'									=> array( 'Oppo', 'Find X9015' ),
+			'X9017'										=> array( 'Oppo', 'Finder X9017' ),
 			'OPPOX9017'									=> array( 'Oppo', 'Finder X9017' ),
 			'R801'										=> array( 'Oppo', 'Real R801' ),
 			'OPPOR801'									=> array( 'Oppo', 'Real R801' ),
+			'OPPOR803'									=> array( 'Oppo', 'Real R803' ),
 			'OPPOR805'									=> array( 'Oppo', 'Real R805' ),
+			'R807'										=> array( 'Oppo', 'Real R807' ),
 			'OPPOR807'									=> array( 'Oppo', 'Real R807' ),
 			'OPPOR817'									=> array( 'Oppo', 'Real R817' ),
 			'OPPOT29'									=> array( 'Oppo', 'T29' ),
-			'OPPOT703'									=> array( 'Oppo', 'T703' ),
+			'(OPPO-?)?T703!'							=> array( 'Oppo', 'T703' ),
 			'OPPOU701'									=> array( 'Oppo', 'Ulike U701' ),
 			'OPPOU7011'									=> array( 'Oppo', 'Find Gemini U7011' ),
+			'OP0118-12'									=> array( 'Oregon Scientific', 'Meep!', TYPE_TABLET ),
 			'P-01D'										=> array( 'Panasonic', 'P-01D' ),
 			'P-02D'										=> array( 'Panasonic', 'Lumix Phone' ),
+			'P-02E'										=> array( 'Panasonic', 'Eluga X' ),
 			'P-04D'										=> array( 'Panasonic', 'Eluga' ),
 			'P-06D'										=> array( 'Panasonic', 'Eluga V' ),
 			'P-07C'										=> array( 'Panasonic', 'P-07C' ),
@@ -1581,7 +2021,8 @@ class DeviceModels {
 			'IM-A830!'									=> array( 'Pantech', 'Vega Racer 2' ),
 			'IM-A840!'									=> array( 'Pantech', 'Vega S5' ),
 			'IM-A850!'									=> array( 'Pantech', 'Vega R3' ),
-			'IM-A860!'									=> array( 'Pantech', 'IM-A860' ),
+			'IM-A860!'									=> array( 'Pantech', 'Vega N˚ 6' ),
+			'IM-A870!'									=> array( 'Pantech', 'IM-A870' ),
 			'IM-T100K'									=> array( 'Pantech', 'Vega N˚ 5', TYPE_TABLET ),
 			'IS06'										=> array( 'Pantech', 'SIRIUS α' ),
 			'ADR8995!'									=> array( 'Pantech', 'Breakout' ),
@@ -1596,57 +2037,119 @@ class DeviceModels {
 			'SKY IM-A600S'								=> array( 'Pantech', 'SIRIUS α' ),
 			'SKY IM-A630K'								=> array( 'Pantech', 'Izar' ),
 			'SKY IM-A650S'								=> array( 'Pantech', 'Vega' ),
+			'PTL21'										=> array( 'Pantech', 'Vega PTL21' ),
 			'IS11PT'									=> array( 'Pantech', 'Mirach IS11PT' ),
+			'FC6100'									=> array( 'Parrot', 'FC6100', TYPE_CAR ),
+			'chagall'									=> array( 'Pegatron', 'Chagall', TYPE_TABLET ),
+			'7500IPS'									=> array( 'Perfeo', '7500IPS', TYPE_TABLET ),
 			'PAT712W'									=> array( 'Perfeo', 'PAT712W', TYPE_TABLET ),
 			'X7G'										=> array( 'Pearl', 'Touchlet X7G', TYPE_TABLET ),
 			'PP4MT-7'									=> array( 'Pendo', 'Pendopad 4', TYPE_TABLET ),
+			'Penta WS802C'								=> array( 'Penta', 'T-Pad WS802C', TYPE_TABLET ),
 			'FWS710EU'									=> array( 'Phicomm', 'FWS710' ),
 			'FWS810'									=> array( 'Phicomm', 'FWS810' ),
+			'PHICOMM-i700v'								=> array( 'Phicomm', 'i700v' ),
 			'Philips PI5000'							=> array( 'Philips', 'PI5000', TYPE_TABLET ),
 			'PI7000'									=> array( 'Philips', 'PI7000', TYPE_TABLET ),
+			'Philips W336'								=> array( 'Philips', 'W336' ),
 			'Philips W536'								=> array( 'Philips', 'W536' ),
 			'Philips W626'								=> array( 'Philips', 'W626' ),
+			'W626'										=> array( 'Philips', 'W626' ),
 			'Philips W632'								=> array( 'Philips', 'W632' ),
+			'Philips W832'								=> array( 'Philips', 'W832' ),
+			'PGM 398'									=> array( 'Pixcom', 'PGM 398' ),
+			'PLOYER-MOMO'								=> array( 'Ployer', 'MOMO', TYPE_TABLET ),
 			'MOMO'										=> array( 'Ployer', 'MOMO', TYPE_TABLET ),
 			'MOMO7'										=> array( 'Ployer', 'MOMO7', TYPE_TABLET ),
 			'MOMO7 Talent'								=> array( 'Ployer', 'MOMO7 Talent', TYPE_TABLET ),
 			'MOMO8'										=> array( 'Ployer', 'MOMO8', TYPE_TABLET ),
 			'MOMO9'										=> array( 'Ployer', 'MOMO9', TYPE_TABLET ),
 			'MOMO9 STAR'								=> array( 'Ployer', 'MOMO9 Star', TYPE_TABLET ),
+			'MOMO11 bird'								=> array( 'Ployer', 'MOMO11 Bird', TYPE_TABLET ),
 			'MOMO11Speed'								=> array( 'Ployer', 'MOMO11 Speed', TYPE_TABLET ),
 			'MOMO15'									=> array( 'Ployer', 'MOMO15', TYPE_TABLET ),
 			'PocketBook A7'								=> array( 'PocketBook', 'A7', TYPE_TABLET ),
 			'PocketBook A10'							=> array( 'PocketBook', 'A10', TYPE_TABLET ),
+			'PocketBook A10 3G'							=> array( 'PocketBook', 'A10 3G', TYPE_TABLET ),
+			'Obreey SURFpad'							=> array( 'PocketBook', 'SURFpad', TYPE_TABLET ),
 			'Mobii 7'									=> array( 'Point Of View', 'Mobii 7', TYPE_TABLET ),
-			'POV TAB-PROTAB30-IPS10'					=> array( 'Point Of View', 'ProTab 30', TYPE_TABLET ),
+			'POV-Mobii-7'								=> array( 'Point Of View', 'Mobii 7', TYPE_TABLET ),
+			'PlayTabPro'								=> array( 'Point Of View', 'PlayTabPro', TYPE_TABLET ),
+			'TAB-PLAYTABPRO'							=> array( 'Point Of View', 'PlayTabPro', TYPE_TABLET ),
+			'POV TAB-PROTAB25!'							=> array( 'Point Of View', 'ProTab 25', TYPE_TABLET ),
+			'POV TAB-PROTAB26!'							=> array( 'Point Of View', 'ProTab 26', TYPE_TABLET ),
+			'POV TAB-PROTAB30!'							=> array( 'Point Of View', 'ProTab 30', TYPE_TABLET ),
+			'TAB-PROTAB2XXL(4)'							=> array( 'Point Of View', 'ProTab2 XXL', TYPE_TABLET ),
+			'POV TAB NAVI7 3G M'						=> array( 'Point Of View', 'Onyx 507', TYPE_TABLET ),
+			'POV TV-HDMI-200BT'							=> array( 'Point Of View', 'Smart TV', TYPE_TELEVISION ),
+			'POV TV-HDMI-KB-01'							=> array( 'Point Of View', 'Smart TV', TYPE_TELEVISION ),
 			'MIDC409'									=> array( 'Polaroid', 'Diamond III', TYPE_TABLET ),
 			'PMID4311'									=> array( 'Polaroid', 'PMID 4311', TYPE_TABLET ),
 			'PMID701C'									=> array( 'Polaroid', 'PMID 701c', TYPE_TABLET ),
+			'POLY PAD 9708HD'							=> array( 'Polypad', '9708 HD', TYPE_TABLET ),
 			'POLY PAD 9716HD'							=> array( 'Polypad', '9716 HD', TYPE_TABLET ),
+			'Polypad C508'								=> array( 'Polypad', 'C508', TYPE_TABLET ),
+			'POLYTRON W2430'							=> array( 'Polytron', 'W2430 Wizard Twins' ),
+			'POLYTRON W2500'							=> array( 'Polytron', 'W2500 Wizard Twins' ),
+			'POLYTRON W3430'							=> array( 'Polytron', 'W3430 Wizard Crystal' ),
 			'ACT2000'									=> array( 'Poptronix', 'ACT2000', TYPE_TABLET ),
+			'PMP3084B'									=> array( 'Prestigio', 'Multipad 3084', TYPE_TABLET ),
+			'PMP3170B'									=> array( 'Prestigio', 'Multipad 3170 Pro', TYPE_TABLET ),
+			'PMP3170BEN'								=> array( 'Prestigio', 'Multipad 3170 Pro', TYPE_TABLET ),
+			'PMP3270B'									=> array( 'Prestigio', 'Multipad 3270 Prime', TYPE_TABLET ),
+			'PMP3370B'									=> array( 'Prestigio', 'Multipad 3370', TYPE_TABLET ),
 			'PMP3384BRU'								=> array( 'Prestigio', 'Multipad 3384', TYPE_TABLET ),
+			'PMP3770B'									=> array( 'Prestigio', 'Multipad 3770', TYPE_TABLET ),
+			'PMP5080B'									=> array( 'Prestigio', 'Multipad 5080', TYPE_TABLET ),
 			'PMP5080CPRO'								=> array( 'Prestigio', 'Multipad 5080 Pro', TYPE_TABLET ),
+			'PMP5097CPRO'								=> array( 'Prestigio', 'Multipad 5097 Pro', TYPE_TABLET ),
+			'PMP5197DULTRA'								=> array( 'Prestigio', 'Multipad 5197 Ultra', TYPE_TABLET ),
+			'PMP5570C'									=> array( 'Prestigio', 'Multipad 5570 Pro', TYPE_TABLET ),	
+			'PMP5580C'									=> array( 'Prestigio', 'Multipad 5580 Prime', TYPE_TABLET ),
+			'PMP5597D'									=> array( 'Prestigio', 'Multipad 5597 Ultra Duo', TYPE_TABLET ),
+			'PMP5770D'									=> array( 'Prestigio', 'Multipad 5770 Pro', TYPE_TABLET ),
+			'PMP5880D'									=> array( 'Prestigio', 'Multipad 5880 Ultra Duo', TYPE_TABLET ),
+			'PMP7100D3G'								=> array( 'Prestigio', 'Multipad 7100 Ultimate 3G', TYPE_TABLET ),
+			'PAP3500 DUO'								=> array( 'Prestigio', 'Multiphone 3500 Duo' ),
+			'PAP4040 DUO'								=> array( 'Prestigio', 'Multiphone 4040 Duo' ),
+			'PAP4300 DUO'								=> array( 'Prestigio', 'Multiphone 4300 Duo' ),
+			'PAP4500DUO'								=> array( 'Prestigio', 'Multiphone 4500 Duo' ),
+			'PAP4500TDUO'								=> array( 'Prestigio', 'Multiphone 4500 Duo' ),
+			'PAP5000TDUO'								=> array( 'Prestigio', 'Multiphone 5000 Duo' ),
+			'MD-0696B'									=> array( 'Prolink', 'MD-0696B', TYPE_TABLET ),
 			'TB07FTA'									=> array( 'Positivo', 'TB07FTA', TYPE_TABLET ),
 			'QW TB-1207'								=> array( 'Qware', 'Pro3', TYPE_TABLET ),
 			'W6'										=> array( 'Ramos', 'W6', TYPE_TABLET ),
 			'W6HD ICS'									=> array( 'Ramos', 'W6HD', TYPE_TABLET ),
 			'W10'										=> array( 'Ramos', 'W10', TYPE_TABLET ),
 			'W10 V2.0'									=> array( 'Ramos', 'W10 v2.0', TYPE_TABLET ),
+			'Ramos W12HD'								=> array( 'Ramos', 'W12HD', TYPE_TABLET ),
 			'W17PRO(Dualcore)'							=> array( 'Ramos', 'W17 Pro Dual Core', TYPE_TABLET ),
 			'W22PRO'									=> array( 'Ramos', 'W22 Pro', TYPE_TABLET ),
+			'W22PRO 3G'									=> array( 'Ramos', 'W22 Pro 3G', TYPE_TABLET ),
+			'Ramos W27Pro'								=> array( 'Ramos', 'W27 Pro', TYPE_TABLET ),
 			'W28(Dualcore)'								=> array( 'Ramos', 'W28 Dual Core', TYPE_TABLET ),
+			'W30(QuadCore)'								=> array( 'Ramos', 'W30 Quad Core', TYPE_TABLET ),
+			'w30hd(QuadCore)'							=> array( 'Ramos', 'W30HD Quad Core', TYPE_TABLET ),
+			'w42(QuadCore)'								=> array( 'Ramos', 'W42 Quad Core', TYPE_TABLET ),
 			'T11AD!'									=> array( 'Ramos', 'T11AD', TYPE_TABLET ),
 			'Readboy G12'								=> array( 'Readboy', 'G12', TYPE_TABLET ),
-			'Rikomagic MK802'							=> array( 'Rikomagic', 'MK802', TYPE_TELEVISION ),
 			'PlayBook'									=> array( 'RIM', 'BlackBerry PlayBook', TYPE_TABLET ),
 			'RBK-490'									=> array( 'Ritmix', 'RBK-490', TYPE_TABLET ),
+			'RMD-755'									=> array( 'Ritmix', 'RBK-755', TYPE_TABLET ),
+			'RMD-1030'									=> array( 'Ritmix', 'RBK-1030', TYPE_TABLET ),
+			'RMD-73G'									=> array( 'Ross&Moor', 'RMD-73G', TYPE_TABLET ),	
+			'RMD-973G'									=> array( 'Ross&Moor', 'RMD-973G', TYPE_TABLET ),
+			'RoverPad 3W T71D'							=> array( 'RoverPad', '3W T71D', TYPE_TABLET ),
 			'A8HD'										=> array( 'Saayi', 'Dropad A8HD', TYPE_TABLET ),
 			'EK-GC100'									=> array( 'Samsung', 'Galaxy Camera', TYPE_CAMERA ),
+			'EK-GC110'									=> array( 'Samsung', 'Galaxy Camera', TYPE_CAMERA ),
 			'GT-B5330!'									=> array( 'Samsung', 'Galaxy Chat' ),
 			'GT-B5510!'									=> array( 'Samsung', 'Galaxy Y Pro' ),
 			'GT-B5512!'									=> array( 'Samsung', 'Galaxy Y Pro Duos' ),
 			'GT-B7510!'									=> array( 'Samsung', 'Galaxy Pro' ),
 			'GT-B9062'									=> array( 'Samsung', 'GT-B9062' ),
+			'GT-B9150'									=> array( 'Samsung', 'Galaxy "Q"' ),
 			'GT-I55(00|03|08)!'							=> array( 'Samsung', 'Galaxy 5' ),
 			'GT-I5510!'									=> array( 'Samsung', 'Galaxy 551' ),
 			'GT-I5700!'									=> array( 'Samsung', 'Galaxy Spica' ),
@@ -1657,24 +2160,34 @@ class DeviceModels {
 			'GT-I8150!'									=> array( 'Samsung', 'Galaxy W' ),
 			'GT-I8160!'									=> array( 'Samsung', 'Galaxy Ace 2' ),
 			'GT-I8190!'									=> array( 'Samsung', 'Galaxy S III Mini' ),
+			'GT-I8240!'									=> array( 'Samsung', 'GT-I8240' ),	
+			'GT-I8245!'									=> array( 'Samsung', 'GT-I8245' ),			
 			'GT-I8250!'									=> array( 'Samsung', 'GT-I8250' ),
+			'GT-I8262!'									=> array( 'Samsung', 'Galaxy Core' ),
 			'GT-I8320!'									=> array( 'Samsung', 'H1' ),
 			'GT-I85(20|30)!'							=> array( 'Samsung', 'Galaxy Beam' ),
-			'GT-I8730!'									=> array( 'Samsung', 'Express' ),							
+			'GT-I8730!'									=> array( 'Samsung', 'Galaxy Express' ),							
 			'GT-I90(00|08|18|88)!'						=> array( 'Samsung', 'Galaxy S' ),
 			'GT-I9001!'									=> array( 'Samsung', 'Galaxy S Plus' ),
 			'GT-I9003!'									=> array( 'Samsung', 'Galaxy SL' ),
 			'GT-I9010!'									=> array( 'Samsung', 'Galaxy S Giorgio Armani' ),
 			'GT-I9050!'									=> array( 'Samsung', 'GT-I9050' ),
 			'GT-I9070!'									=> array( 'Samsung', 'Galaxy S Advance' ),
+			'GT-I9082!'									=> array( 'Samsung', 'Galaxy Grand Duos' ),
 			'GT-I91(00|08)!'							=> array( 'Samsung', 'Galaxy S II' ),
 			'GT-I9103!'									=> array( 'Samsung', 'Galaxy R' ),
+			'GT-I9105!'									=> array( 'Samsung', 'Galaxy S II Plus' ),
+			'GT-I9150!'									=> array( 'Samsung', 'Galaxy "Fonblet 5.8"' ),
+			'GT-I9152!'									=> array( 'Samsung', 'Galaxy "Fonblet 5.8" Duos' ),
+			'GT-I9190!'									=> array( 'Samsung', 'Galaxy S4 Mini' ),
+			'GT-I9200!'									=> array( 'Samsung', 'Galaxy S II' ),
+			'GT-I9205'									=> array( 'Samsung', 'Galaxy "Fonblet 6.3"' ),
 			'GT-I9210!'									=> array( 'Samsung', 'Galaxy S II LTE' ),
 			'GT-I92(20|28)!'							=> array( 'Samsung', 'Galaxy Note' ),
 			'GT-I9250!'									=> array( 'Samsung', 'Galaxy Nexus' ),
-			'GT-I9260'									=> array( 'Samsung', 'Galaxy Premier' ),
+			'GT-I92(60|68)!'							=> array( 'Samsung', 'Galaxy Premier' ),
 			'GT-I93(00|03|05|08)!'						=> array( 'Samsung', 'Galaxy S III' ),
-			'GT-I95(00|05)!'							=> array( 'Samsung', 'Galaxy S IV' ),
+			'GT-I95(00|05)!'							=> array( 'Samsung', 'Galaxy S4' ),
 			'GT-I9800!'									=> array( 'Samsung', 'GT-I9800' ),
 			'GT-N5100'									=> array( 'Samsung', 'Galaxy Note 8.0', TYPE_TABLET ),
 			'GT-N70(00|05)!'							=> array( 'Samsung', 'Galaxy Note' ),
@@ -1694,8 +2207,11 @@ class DeviceModels {
 			'GT-P75(01|11)!'							=> array( 'Samsung', 'Galaxy Tab 10.1N', TYPE_TABLET ),
 			'GT-P8110!'									=> array( 'Samsung', 'Nexus 10', TYPE_TABLET ),
 			'GT-P8200!'									=> array( 'Samsung', 'Galaxy Tab "Roma"', TYPE_TABLET ),
+			'GT-S5282!'									=> array( 'Samsung', 'Galaxy Star' ),
 			'GT-S5300!'									=> array( 'Samsung', 'Galaxy Pocket' ),
 			'GT-S5302!'									=> array( 'Samsung', 'Galaxy Pocket Duos' ),
+			'GT-S5310!'									=> array( 'Samsung', 'Galaxy Pocket 2' ),
+			'GT-S5312!'									=> array( 'Samsung', 'Galaxy Pocket 2 Duos' ),
 			'GT-S53(60|63|69)!'							=> array( 'Samsung', 'Galaxy Y' ),
 			'GT-S5367!'									=> array( 'Samsung', 'Galaxy Y TV' ),
 			'GT-S5368!'									=> array( 'Samsung', 'GT-S5368' ),
@@ -1707,15 +2223,22 @@ class DeviceModels {
 			'GT-S6010'									=> array( 'Samsung', 'Galaxy Music' ),
 			'GT-S6012!'									=> array( 'Samsung', 'Galaxy Music Duos' ),
 			'GT-S6102!'									=> array( 'Samsung', 'Galaxy Y Duos' ),
-			'GT-S6352'									=> array( 'Samsung', 'Galaxy Ace Duos' ),
-			'GT-S6358'									=> array( 'Samsung', 'Galaxy Ace' ),
+			'GT-S6310!'									=> array( 'Samsung', 'Galaxy Young' ),
+			'GT-S6312!'									=> array( 'Samsung', 'Galaxy Young Duos' ),
+			'GT-S6352!'									=> array( 'Samsung', 'Galaxy Ace Duos' ),
+			'GT-S6358!'									=> array( 'Samsung', 'Galaxy Ace' ),
 			'GT-S6500!'									=> array( 'Samsung', 'Galaxy Mini 2' ),
 			'GT-S6702!'									=> array( 'Samsung', 'Galaxy Y Duos' ),
 			'GT-S6802!'									=> array( 'Samsung', 'Galaxy Ace Duos' ),
-			'GT-S7500!'									=> array( 'Samsung', 'Galaxy Ace Plus' ),
+			'GT-S6810!'									=> array( 'Samsung', 'Galaxy Frame' ),
+			'GT-S75(00|08)!'							=> array( 'Samsung', 'Galaxy Ace Plus' ),
 			'GT-S7560!'									=> array( 'Samsung', 'Galaxy Ace II x' ),
-			'GT-S7562!'									=> array( 'Samsung', 'Galaxy S Duos' ),
+			'GT-S75(62|68)!'							=> array( 'Samsung', 'Galaxy S Duos' ),
+			'GT-S7572!'									=> array( 'Samsung', 'GT-S7572' ),
 			'GT-S7710!'									=> array( 'Samsung', 'Galaxy Xcover 2' ),
+			'GT-S8500'									=> array( 'Samsung', 'Wave' ),
+			'GT-S8530'									=> array( 'Samsung', 'Wave II' ),
+			'GT-S9081'									=> array( 'Samsung', 'GT-S9081' ),
 			'GT-T959!'									=> array( 'Samsung', 'Galaxy S Vibrant' ),
 			'SCH-i509'									=> array( 'Samsung', 'Galaxy Y' ),
 			'SCH-i559'									=> array( 'Samsung', 'Galaxy Pop' ),
@@ -1735,6 +2258,7 @@ class DeviceModels {
 			'SCH-I400'									=> array( 'Samsung', 'Continuum' ),
 			'SCH-I405( 4G)?$!'							=> array( 'Samsung', 'Stratosphere' ),
 			'SCH-I405U'									=> array( 'Samsung', 'Galaxy Metrix' ),
+			'SCH-I415( 4G)?$!'							=> array( 'Samsung', 'Stratosphere II' ),
 			'SCH-I500'									=> array( 'Samsung', 'Fascinate' ),
 			'SCH-I510'									=> array( 'Samsung', 'Stealth V' ),
 			'SCH-I510 4G'								=> array( 'Samsung', 'Droid Charge' ),
@@ -1744,14 +2268,19 @@ class DeviceModels {
 			'SCH-I619'									=> array( 'Samsung', 'SCH-I619' ),
 			'SCH-I659'									=> array( 'Samsung', 'Galaxy Ace Plus' ),
 			'SCH-I699'									=> array( 'Samsung', 'Galaxy Trend' ),
+			'SCH-I739'									=> array( 'Samsung', 'SCH-I739' ),
 			'SCH-I779'									=> array( 'Samsung', 'SCH-I779' ),
 			'SCH-I800'									=> array( 'Samsung', 'Galaxy Tab 7.0', TYPE_TABLET ),
 			'SCH-I815!'									=> array( 'Samsung', 'Galaxy Tab 7.7', TYPE_TABLET ),
+			'SCH-I829'									=> array( 'Samsung', 'SCH-I829' ),
+			'SCH-I879'									=> array( 'Samsung', 'Captivate' ),
 			'SCH-I905!'									=> array( 'Samsung', 'Galaxy Tab 10.1', TYPE_TABLET ),
 			'SCH-I909'									=> array( 'Samsung', 'Galaxy S' ),
 			'SCH-I915!'									=> array( 'Samsung', 'Galaxy Tab 2 (10.1)', TYPE_TABLET ),
+			'SCH-I919!'									=> array( 'Samsung', 'SCH-I919' ),
 			'SCH-I925!'									=> array( 'Samsung', 'Galaxy Note 10.1', TYPE_TABLET ),
-			'SCH-I939'									=> array( 'Samsung', 'Galaxy S III' ),
+			'SCH-I939!'									=> array( 'Samsung', 'Galaxy S III' ),
+			'SCH-I959'									=> array( 'Samsung', 'Galaxy S4' ),
 			'SCH-L710'									=> array( 'Samsung', 'Galaxy S III' ),
 			'SCH-M828!'									=> array( 'Samsung', 'Galaxy Precedent' ),
 			'SCH-N719'									=> array( 'Samsung', 'Galaxy Note II' ),
@@ -1760,8 +2289,10 @@ class DeviceModels {
 			'SCH-R680'									=> array( 'Samsung', 'Repp' ),
 			'SCH-R720'									=> array( 'Samsung', 'Admire' ),
 			'SCH-R730'									=> array( 'Samsung', 'Transfix' ),
+			'SCH-R740!'									=> array( 'Samsung', 'SCH-R740' ),
 			'SCH-R760'									=> array( 'Samsung', 'Galaxy S II' ),
 			'SCH-R820'									=> array( 'Samsung', 'Admire' ),
+			'SCH-R830!'									=> array( 'Samsung', 'Axiom' ),
 			'SCH-R880'									=> array( 'Samsung', 'Acclaim' ),
 			'SCH-R910'									=> array( 'Samsung', 'Galaxy Indulge 4G' ),
 			'SCH-R915'									=> array( 'Samsung', 'Galaxy Indulge' ),
@@ -1769,23 +2300,29 @@ class DeviceModels {
 			'SCH-R930'									=> array( 'Samsung', 'Galaxy S Aviator' ),
 			'SCH-R940'									=> array( 'Samsung', 'Galaxy S Lightray' ),
 			'SCH-R950'									=> array( 'Samsung', 'Galaxy Note II' ),
+			'SCH-R970C'									=> array( 'Samsung', 'SCH-R970C' ),
 			'SCH-S720C'									=> array( 'Samsung', 'Galaxy Proclaim' ),
 			'SCH-S735C'									=> array( 'Samsung', 'SCH-S735' ),
 			'SCH-S950C'									=> array( 'Samsung', 'Galaxy S Showcase' ),
+			'SCH-V727'									=> array( 'Samsung', 'Galaxy S4' ),
 			'SCH-W799!'									=> array( 'Samsung', 'SCH-W799' ),
 			'SCH-W899'									=> array( 'Samsung', 'SCH-W899' ),
 			'SCH-W999'									=> array( 'Samsung', 'SCH-W999' ),
+			'SCH-W2013'									=> array( 'Samsung', 'SCH-W2013' ),
 			'SGH-E258'									=> array( 'Samsung', 'SGH-E258' ),
 			'SGH-I317!'									=> array( 'Samsung', 'Galaxy Note II' ),
-			'SGH-I337!'									=> array( 'Samsung', 'Galaxy S IV' ),
+			'SGH-I337!'									=> array( 'Samsung', 'Galaxy S4' ),
+			'SGH-I437!'									=> array( 'Samsung', 'Galaxy Express' ),
 			'SGH-I497'									=> array( 'Samsung', 'Galaxy Tab 2 (10.1)', TYPE_TABLET ),
 			'SGH-I547!'									=> array( 'Samsung', 'Galaxy Rugby Pro' ),
+			'SGH-I577!'									=> array( 'Samsung', 'Galaxy Exhilarate' ),	
 			'SGH-I717!'									=> array( 'Samsung', 'Galaxy Note' ),
 			'SGH-I727'									=> array( 'Samsung', 'Galaxy S II Skyrocket' ),
 			'SGH-I727R'									=> array( 'Samsung', 'Galaxy S II' ),
 			'SGH-I7(47|48)!'							=> array( 'Samsung', 'Galaxy S III' ),
 			'SGH-I757!'									=> array( 'Samsung', 'Galaxy S II Skyrocket HD' ),
 			'SGH-I9?777!'								=> array( 'Samsung', 'Galaxy S II' ),
+			'SGH-I827D'									=> array( 'Samsung', 'Galaxy Ace Q' ),
 			'SGH-I847'									=> array( 'Samsung', 'Rugby Smart' ),
 			'SGH-I8(96|97)!'							=> array( 'Samsung', 'Captivate' ),
 			'SGH-I927!'									=> array( 'Samsung', 'Captivate Glide' ),
@@ -1800,6 +2337,7 @@ class DeviceModels {
 			'SGH-T499'									=> array( 'Samsung', 'Dart' ),
 			'SGH-T499[VY]!'								=> array( 'Samsung', 'Galaxy Mini' ),
 			'SGH-T589!'									=> array( 'Samsung', 'Gravity Smart' ),
+			'SGH-T599!'									=> array( 'Samsung', 'Exhibit' ),	
 			'SGH-T679!'									=> array( 'Samsung', 'Exhibit II 4G' ),
 			'SGH-T699'									=> array( 'Samsung', 'S Blaze Q' ),
 			'SGH-T759'									=> array( 'Samsung', 'Exhibit 4G' ),
@@ -1815,6 +2353,7 @@ class DeviceModels {
 			'SGH-T959D'									=> array( 'Samsung', 'Galaxy S Fascinate 3G+' ),
 			'SGH-T959P'									=> array( 'Samsung', 'Galaxy S Fascinate 4G' ),
 			'SGH-T959V'									=> array( 'Samsung', 'Galaxy S 4G' ),
+			'SGH-T959W'									=> array( 'Samsung', 'Galaxy S 4G' ),
 			'SGH-T989'									=> array( 'Samsung', 'Galaxy S II' ),
 			'SGH-T989D'									=> array( 'Samsung', 'Galaxy S II X' ),
 			'SGH-T999!'									=> array( 'Samsung', 'Galaxy S Blaze 4G' ),
@@ -1825,9 +2364,11 @@ class DeviceModels {
 			'SHV-E160!'									=> array( 'Samsung', 'Galaxy Note' ),
 			'SHV-E170!'									=> array( 'Samsung', 'Galaxy R' ),
 			'SHV-E210!'									=> array( 'Samsung', 'Galaxy S III' ),
+			'SHV-E220!'									=> array( 'Samsung', 'Galaxy Pop' ),
+			'SHV-E230!'									=> array( 'Samsung', 'Galaxy Note 10.1' ),
 			'SHV-E250!'									=> array( 'Samsung', 'Galaxy Note II' ),
 			'SHV-E270!'									=> array( 'Samsung', 'Galaxy Grand' ),
-			'SHV-E300!'									=> array( 'Samsung', 'Galaxy S IV' ),
+			'SHV-E300!'									=> array( 'Samsung', 'Galaxy S4' ),
 			'SHW-M100!'									=> array( 'Samsung', 'Galaxy A' ),
 			'SHW-M110!'									=> array( 'Samsung', 'Galaxy S' ),
 			'SHW-M130L!'								=> array( 'Samsung', 'Galaxy U' ),
@@ -1843,7 +2384,7 @@ class DeviceModels {
 			'SHW-M340!'									=> array( 'Samsung', 'Galaxy M Style' ),
 			'SHW-M380!'									=> array( 'Samsung', 'Galaxy Tab 10.1', TYPE_TABLET ),
 			'SHW-M440!'									=> array( 'Samsung', 'Galaxy S III' ),
-			'SHW-M480!'									=> array( 'Samsung', 'Galaxy Note 10.1' ),
+			'SHW-M4(80|85)!'							=> array( 'Samsung', 'Galaxy Note 10.1' ),
 			'SMT-i9100'									=> array( 'Samsung', 'SMT-I9100', TYPE_TABLET ),
 			'SPH-D600'									=> array( 'Samsung', 'Conquer 4G' ),
 			'SPH-D700'									=> array( 'Samsung', 'Epic 4G' ),
@@ -1855,16 +2396,18 @@ class DeviceModels {
 			'SPH-L900'									=> array( 'Samsung', 'Galaxy Note II' ),
 			'SPH-M820!'									=> array( 'Samsung', 'Galaxy Prevail' ),
 			'SPH-M830'									=> array( 'Samsung', 'Galaxy Rush' ),
-			'SPH-M580'									=> array( 'Samsung', 'Replenish' ),
+			'SPH-M580!'									=> array( 'Samsung', 'Replenish' ),
 			'SPH-M900'									=> array( 'Samsung', 'Moment' ),
 			'SPH-M910'									=> array( 'Samsung', 'Intercept' ),
 			'SPH-M920'									=> array( 'Samsung', 'Transform' ),
 			'SPH-M930!'									=> array( 'Samsung', 'Transform Ultra' ),
 			'SPH-M950'									=> array( 'Samsung', 'Galaxy Reverb' ),
 			'SPH-P100'									=> array( 'Samsung', 'Galaxy Tab', TYPE_TABLET ),
+			'SPH-P500'									=> array( 'Samsung', 'Galaxy Tab 2 10.1', TYPE_TABLET ),
 			'YP-GB1'									=> array( 'Samsung', 'Galaxy Player', 'media' ),
 			'YP-GB70'									=> array( 'Samsung', 'Galaxy Player 70', 'media' ),
 			'YP-GB70D'									=> array( 'Samsung', 'Galaxy Player 70 Plus', 'media' ),
+			'YP-GP1'									=> array( 'Samsung', 'Galaxy Player 5.8', 'media' ),
 			'YP-GS1'									=> array( 'Samsung', 'Galaxy S WiFi 3.6', 'media' ),
 			'YP-G1'										=> array( 'Samsung', 'Galaxy S WiFi 4.0', 'media' ),
 			'YP-GI1'									=> array( 'Samsung', 'Galaxy S WiFi 4.2', 'media' ),
@@ -1877,11 +2420,18 @@ class DeviceModels {
 			'T959'										=> array( 'Samsung', 'Galaxy S Vibrant' ),
 			'Captivate-I897'							=> array( 'Samsung', 'Captivate' ),
 			'Galaxy'									=> array( 'Samsung', 'Galaxy' ),
+			'Galaxy ACE'								=> array( 'Samsung', 'Galaxy Ace' ),
+			'Galaxy Mini'								=> array( 'Samsung', 'Galaxy Mini' ),
+			'Galaxy Mini Plus 4G'						=> array( 'Samsung', 'Galaxy Mini Plus' ),
 			'Galaxy Note'								=> array( 'Samsung', 'Galaxy Note' ),
+			'Galaxy Note II'							=> array( 'Samsung', 'Galaxy Note II' ),
 			'GalaxyS'									=> array( 'Samsung', 'Galaxy S' ),
 			'Galaxy S II'								=> array( 'Samsung', 'Galaxy S II' ),
+			'Galaxy S III'								=> array( 'Samsung', 'Galaxy S III' ),
 			'Galaxy X'									=> array( 'Samsung', 'Galaxy X' ),
 			'Galaxy Spica'								=> array( 'Samsung', 'Galaxy Spica' ),
+			'Galaxy pop plus 4G'						=> array( 'Samsung', 'Galaxy Pop Plus' ),
+			'Galaxy Precedent'							=> array( 'Samsung', 'Galaxy Precedent' ),
 			'GALAXY Tab'								=> array( 'Samsung', 'Galaxy Tab', TYPE_TABLET ),
 			'Vibrantmtd'								=> array( 'Samsung', 'Vibrant' ),
 			'Vibrant T959'								=> array( 'Samsung', 'Vibrant' ),
@@ -1897,7 +2447,9 @@ class DeviceModels {
 			'SC-04D'									=> array( 'Samsung', 'Galaxy Nexus' ),
 			'SC-05D'									=> array( 'Samsung', 'Galaxy Note LTE' ),
 			'SC-06D'									=> array( 'Samsung', 'Galaxy S III' ),
+			'SCL21'										=> array( 'Samsung', 'Galaxy S III Progre' ),
 			'ISW11SC'									=> array( 'Samsung', 'Galaxy S II WiMAX' ),
+			'Bambook S1'								=> array( 'Shanda', 'Bambook S1', TYPE_TABLET ),
 			'A01SH'										=> array( 'Sharp', 'A01SH' ),
 			'IS01'										=> array( 'Sharp', 'IS01' ),
 			'IS03'										=> array( 'Sharp', 'IS03' ),
@@ -1907,6 +2459,7 @@ class DeviceModels {
 			'IS13SH'									=> array( 'Sharp', 'Aquos IS13SH' ),
 			'IS14SH'									=> array( 'Sharp', 'Aquos IS14SH' ),
 			'ISW16SH'									=> array( 'Sharp', 'Aquos ISW16SH' ),
+			'IS17SH'									=> array( 'Sharp', 'Aquos CL IS17SH' ),
 			'EB-W51GJ'									=> array( 'Sharp', 'EB-W51GJ' ),
 			'SBM003SH'									=> array( 'Sharp', 'Galapagos' ),
 			'SBM005SH'									=> array( 'Sharp', 'Galapagos' ),
@@ -1921,6 +2474,7 @@ class DeviceModels {
 			'SBM107SH'									=> array( 'Sharp', 'Aquos 107SH' ),
 			'SBM107SHB'									=> array( 'Sharp', 'Aquos 107SH' ),
 			'SBM200SH'									=> array( 'Sharp', 'PANTONE 6 200SH' ),
+			'SBM203SH'									=> array( 'Sharp', 'Aquos Xx 203SH' ),
 			'SH-01D'									=> array( 'Sharp', 'Aquos SH-01D' ),
 			'SH-01E'									=> array( 'Sharp', 'Aquos si SH-01E' ),
 			'SH-02D'									=> array( 'Sharp', 'Aquos slider SH-02D' ),
@@ -1938,34 +2492,50 @@ class DeviceModels {
 			'SH80F'										=> array( 'Sharp', 'Aquos SH80F' ),
 			'SH530U'									=> array( 'Sharp', 'SH530U' ),
 			'SH-631M'									=> array( 'Sharp', 'SH631M' ),
+			'SH631W'									=> array( 'Sharp', 'SH631W' ),
+			'SH837W'									=> array( 'Sharp', 'SH837W' ),
+			'SH930W'									=> array( 'Sharp', 'SH930W' ),
 			'SH72x8U'									=> array( 'Sharp', 'SH72x8U' ),
 			'SH8118U'									=> array( 'Sharp', 'SH8118U' ),
 			'SH8128U'									=> array( 'Sharp', 'SH8128U' ),
 			'SH8158U'									=> array( 'Sharp', 'SH8158U' ),
+			'SH8168U'									=> array( 'Sharp', 'SH8168U' ),
 			'SH8188U'									=> array( 'Sharp', 'SH8188U' ),
 			'SH8268U'									=> array( 'Sharp', 'SH8268U' ),
+			'SHL21'										=> array( 'Sharp', 'Aquos Serie SHL21' ),
+			'SHT21'										=> array( 'Sharp', 'Aquos Pad SHT21', TYPE_TABLET ),
 			'INFOBAR C01'								=> array( 'Sharp', 'INFOBAR C01' ),
 			'SPX-5'										=> array( 'Simvalley', 'SPX-5' ),
 			'SPX-5 3G'									=> array( 'Simvalley', 'SPX-5 3G' ),
+			'SPX-12'									=> array( 'Simvalley', 'SPX-12' ),
+			'Skyworth PE90'								=> array( 'Skyworth', 'PE90' ),
+			'Andromax U'								=> array( 'Smartfren', 'Andromax U' ),
+			'Smartfren Tab 7'							=> array( 'Smartfren', 'Tab 7' ),
 			'SmartQ G7'									=> array( 'SmartQ', 'G7', TYPE_TABLET ),
 			'SmartQT7'									=> array( 'SmartQ', 'T7', TYPE_TABLET ),
 			'SmartQT10'									=> array( 'SmartQ', 'T10', TYPE_TABLET ),
 			'SmartQT15'									=> array( 'SmartQ', 'T15', TYPE_TABLET ),
 			'SmartQT19'									=> array( 'SmartQ', 'T19', TYPE_TABLET ),
 			'SmartQT20'									=> array( 'SmartQ', 'T20', TYPE_TABLET ),
+			'T20'										=> array( 'SmartQ', 'T20', TYPE_TABLET ),
+			'T30'										=> array( 'SmartQ', 'T30', TYPE_TABLET ),
 			'OMS1 6'									=> array( 'Sony Ericsson', 'A8i' ),
 			'C15(04|05)!'								=> array( 'Sony', 'Xperia E' ),
 			'C16(04|05)!'								=> array( 'Sony', 'Xperia E dual' ),
-			'C21(04|05)!'								=> array( 'Sony', 'Xperia "Gaga"' ),
+			'C21(04|05)!'								=> array( 'Sony', 'Xperia L' ),
 			'C3602'										=> array( 'Sony', 'Xperia "Togari"' ),
-			'C430[0-9]!'								=> array( 'Sony', 'C430X' ),
-			'C5303'										=> array( 'Sony', 'Xperia "HuaShan"' ),
+			'C53(02|03|06)!'							=> array( 'Sony', 'Xperia SP' ),
 			'C550[0-9]!'								=> array( 'Sony', 'Xperia "Dogo"' ),
 			'C65(02|03|06)!'							=> array( 'Sony', 'Xperia ZL' ),
-			'C6603'										=> array( 'Sony', 'Xperia Z' ),
+			'C66(02|03|06)!'							=> array( 'Sony', 'Xperia Z' ),
+			'C670[0-9]!'								=> array( 'Sony', 'Xperia "Honami"' ),
+//			'C6750'										
+			'C6802'										=> array( 'Sony', 'Xperia "Gaga"' ),
+			'C69(02|07)!'								=> array( 'Sony', 'Xperia Tablet Z', TYPE_TABLET ),
 			'E10(a|i|iv)!'								=> array( 'Sony Ericsson', 'Xperia X10 Mini' ),
 			'E15(a|i|iv|i-o)?$!'						=> array( 'Sony Ericsson', 'Xperia X8' ),
 			'E16i!'										=> array( 'Sony Ericsson', 'W8 Walkman' ),
+			'L36h'										=> array( 'Sony', 'Xperia Z' ),
 			'LT11i!'									=> array( 'Sony Ericsson', 'Xperia Neo V' ),
 			'LT15(a|i|iv|i-o)?$!'						=> array( 'Sony Ericsson', 'Xperia Arc' ),
 			'LT15i Speed Edition'						=> array( 'Sony Ericsson', 'Xperia Arc' ),
@@ -1990,7 +2560,7 @@ class DeviceModels {
 			'ST15(a|i)!'								=> array( 'Sony Ericsson', 'Xperia Mini' ),
 			'ST17(a|i)!'								=> array( 'Sony Ericsson', 'Xperia Active' ),
 			'ST18(a|av|i|iv)!'							=> array( 'Sony Ericsson', 'Xperia Ray' ),
-			'ST21(a|i)?$!'								=> array( 'Sony', 'Xperia Tipo' ),
+			'ST21(a|i|i-o|iv)?$!'						=> array( 'Sony', 'Xperia Tipo' ),
 			'ST21(a2|i2)!'								=> array( 'Sony', 'Xperia Tipo Dual' ),
 			'ST23(a|i)!'								=> array( 'Sony', 'Xperia Miro' ),
 			'ST25(a|i)!'								=> array( 'Sony', 'Xperia U' ),
@@ -2001,7 +2571,7 @@ class DeviceModels {
 			'WT18i!'									=> array( 'Sony Ericsson', 'Walkman' ),
 			'WT19(a|i|iv)!'								=> array( 'Sony Ericsson', 'Live with Walkman' ),
 			'X8'										=> array( 'Sony Ericsson', 'Xperia X8' ),
-			'X10(a|i|iv|s)?$!'							=> array( 'Sony Ericsson', 'Xperia X10' ),
+			'X10(a|i|iv|i-o|s)?$!'						=> array( 'Sony Ericsson', 'Xperia X10' ),
 			'X10 ?(Mini|Mini Pro)$!'					=> array( 'Sony Ericsson', 'Xperia X10 Mini Pro' ),
 			'Z1i'										=> array( 'Sony Ericsson', 'Xperia Play' ),
 			'S51SE'										=> array( 'Sony Ericsson', 'Xperia Mini' ),
@@ -2016,80 +2586,120 @@ class DeviceModels {
 			'SO-02E'									=> array( 'Sony', 'Xperia Z' ),
 			'SO-03C'									=> array( 'Sony Ericsson', 'Xperia Ray' ),
 			'SO-03D'									=> array( 'Sony Ericsson', 'Xperia Acro HD' ),
-			'SO-03E'									=> array( 'Sony', 'Xperia "Honami"' ),
+			'SO-03E'									=> array( 'Sony', 'Xperia Tablet Z', TYPE_TABLET ),
 			'SO-04D'									=> array( 'Sony', 'Xperia GX' ),
+			'SO-04E'									=> array( 'Sony', 'Xperia "Dogo"' ),
 			'SO-05D'									=> array( 'Sony', 'Xperia SX' ),
 			'SOL21'										=> array( 'Sony', 'Xperia VL' ),
 			'Xperia X1'									=> array( 'Sony Ericsson', 'Xperia X1' ),
 			'Xperia X8'									=> array( 'Sony Ericsson', 'Xperia X8' ),
 			'Xperia X10'								=> array( 'Sony Ericsson', 'Xperia X10' ),
-			'Xperia Ray'								=> array( 'Sony Ericsson', 'Xperia Ray' ),
 			'Xperia Acro S'								=> array( 'Sony', 'Xperia Acro S' ),
+			'Xperia Active'								=> array( 'Sony Ericsson', 'Xperia Active' ),
 			'Xperia Arc'								=> array( 'Sony Ericsson', 'Xperia Arc' ),
 			'Xperia Arc S'								=> array( 'Sony Ericsson', 'Xperia Arc S' ),
+			'Xperia Go'									=> array( 'Sony', 'Xperia Go' ),
 			'Xperia ion'								=> array( 'Sony', 'Xperia Ion' ),
+			'Xperia J'									=> array( 'Sony', 'Xperia J' ),
+			'Xperia Miro'								=> array( 'Sony', 'Xperia Miro' ),
 			'Xperia Mini'								=> array( 'Sony Ericsson', 'Xperia Mini' ),
 			'Xperia Mini Pro'							=> array( 'Sony Ericsson', 'Xperia Mini Pro' ),
 			'Xperia Neo'								=> array( 'Sony Ericsson', 'Xperia Neo' ),
 			'Xperia NeoV'								=> array( 'Sony Ericsson', 'Xperia Neo V' ),
 			'Xperia Neo V'								=> array( 'Sony Ericsson', 'Xperia Neo V' ),
+			'Xperia Neo L'								=> array( 'Sony', 'Xperia Neo L' ),
+			'Xperia P'									=> array( 'Sony', 'Xperia P' ),
 			'Xperia Play'								=> array( 'Sony Ericsson', 'Xperia Play' ),
 			'Xperia Pro'								=> array( 'Sony Ericsson', 'Xperia Pro' ),
+			'Xperia Ray'								=> array( 'Sony Ericsson', 'Xperia Ray' ),
 			'Xperia S'									=> array( 'Sony', 'Xperia S' ),
+			'Xperia SL'									=> array( 'Sony', 'Xperia SL' ),
 			'Xperia Sola'								=> array( 'Sony', 'Xperia Sola' ),
+			'Xperia T'									=> array( 'Sony', 'Xperia T' ),
 			'Xperia Tipo'								=> array( 'Sony', 'Xperia Tipo' ),
+			'Xperia U'									=> array( 'Sony', 'Xperia U' ),
+			'Xperia Z'									=> array( 'Sony', 'Xperia Z' ),
 			'Xperia Live with Walkman'					=> array( 'Sony Ericsson', 'Live with Walkman' ),
 			'Live ?With ?Walkman!'						=> array( 'Sony Ericsson', 'Live with Walkman' ),
+			'Neo V'										=> array( 'Sony Ericsson', 'Xperia Neo V' ),
 			'Hayabusa'									=> array( 'Sony', 'Xperia Ion' ),
 			'Nozomi'									=> array( 'Sony', 'Xperia S' ),
 			'Tablet P'									=> array( 'Sony', 'Tablet P', TYPE_TABLET ),
 			'Tablet S'									=> array( 'Sony', 'Tablet S', TYPE_TABLET ),
-			'SGPT12'									=> array( 'Sony', 'Tablet S', TYPE_TABLET ),
+			'SGPT12'									=> array( 'Sony', 'Xperia Tablet S', TYPE_TABLET ),
+			'SGPT13'									=> array( 'Sony', 'Xperia Tablet S', TYPE_TABLET ),
+			'SGP311'									=> array( 'Sony', 'Xperia Tablet Z', TYPE_TABLET ),
+			'SGP321'									=> array( 'Sony', 'Xperia Tablet Z', TYPE_TABLET ),
 			'NWZ?-Z1000Series!'							=> array( 'Sony', 'Walkman Z', TYPE_MEDIA ),
 			'NSZ-GP9'									=> array( 'Sony', 'NSZ-GP9', TYPE_TELEVISION, FLAG_GOOGLETV ),
 			'NSZ-GS7'									=> array( 'Sony', 'NSZ-GS7', TYPE_TELEVISION, FLAG_GOOGLETV ),
 			'NSZ-GT1'									=> array( 'Sony', 'NSZ-GT1', TYPE_TELEVISION, FLAG_GOOGLETV ),
 			'Spice Mi280'								=> array( 'Spice', 'Mi-280' ),
+			'SPICE Mi-285'								=> array( 'Spice', 'Mi-285' ),
 			'Spice Mi300'								=> array( 'Spice', 'Mi-300' ),
+			'CSL Spice MI300'							=> array( 'Spice', 'Mi-300' ),
 			'Spice Mi-310'								=> array( 'Spice', 'Mi-310' ),
+			'Mi320'										=> array( 'Spice', 'Mi-320' ),
+			'Spice Mi-350'								=> array( 'Spice', 'Mi-350' ),
 			'Spice Mi-355'								=> array( 'Spice', 'Mi-355' ),
+			'CSL-MI410'									=> array( 'Spice', 'Mi-410' ),
 			'Spice Mi-425'								=> array( 'Spice', 'Mi-425' ),
+			'Spice Mi-435'								=> array( 'Spice', 'Mi-435' ),
+			'Spice Mi-495'								=> array( 'Spice', 'Mi-495' ),
 			'Spice Mi-500'								=> array( 'Spice', 'Mi-500' ),
 			'SPICE Mi-720'								=> array( 'Spice', 'Mi-720' ),
+			'SpiceMi1010'								=> array( 'Spice', 'Mi-1010 Stellar Pad', TYPE_TABLET ),
+			'A5000'										=> array( 'Star', 'A5000' ),
 			'A7272+'									=> array( 'Star', 'A7272+' ),
-			'e1109 v73 gq1002 ctp'						=> array( 'Star', 'X18i' ),
+			'N710'										=> array( 'Star', 'N710' ),
+			'e1808 v75!'								=> array( 'Star', 'N8000' ),
+			'V1277'										=> array( 'Star', 'V1277' ),
+			'e1109 v73!'								=> array( 'Star', 'X18i' ),
 			'Cyclone Voyager'							=> array( 'Sumvision', 'Cyclone Voyager', TYPE_TABLET ),
 			'M1001'										=> array( 'Superpad', 'M1001', TYPE_TABLET ),
 			'TS1004T'									=> array( 'Surf 3Q', 'TS1004T', TYPE_TABLET ),
 			'SYTABEX7-2'								=> array( 'Sylvania', 'SYTABEX7', TYPE_TABLET ),
+			'Synrgic Uno M1'							=> array( 'Synrgic', 'Uno M1' ),
 			'KM-S200'									=> array( 'TAKE', 'Janus KM-S200' ),
+			'TCL A506'									=> array( 'TCL', 'A506' ),
 			'TCL A860'									=> array( 'TCL', 'A860' ),
 			'TCL A906'									=> array( 'TCL', 'A906' ),
 			'TCL A909'									=> array( 'TCL', 'A909' ),
 			'TCL A919'									=> array( 'TCL', 'A919' ),
 			'TCL A966'									=> array( 'TCL', 'A966' ),
 			'TCL A968'									=> array( 'TCL', 'A968' ),
+			'TCL A988'									=> array( 'TCL', 'A988' ),
 			'TCL A990'									=> array( 'TCL', 'A990' ),
 			'TCL A996'									=> array( 'TCL', 'A996' ),
 			'TCL A998'									=> array( 'TCL', 'A998' ),
 			'TCL C990+'									=> array( 'TCL', 'C990+' ),
+			'TCL-D668'									=> array( 'TCL', 'D668' ),
 			'TCL GENESEE E708'							=> array( 'TCL', 'Genesee E708' ),
 			'TCL S500'									=> array( 'TCL', 'S500' ),
 			'(TCL )?S600!'								=> array( 'TCL', 'S600' ),
+			'TCL S800'									=> array( 'TCL', 'S800' ),
+			'TCL S820'									=> array( 'TCL', 'S820' ),
 			'TCL S830'									=> array( 'TCL', 'S830' ),
 			'TCL S900'									=> array( 'TCL', 'S900' ),
 			'TCL W939'									=> array( 'TCL', 'W939' ),
+			'TCL W969'									=> array( 'TCL', 'W969' ),
 			'TCL Y710'									=> array( 'TCL', 'Y710' ),
 			'A10t(5DM3)'								=> array( 'Teclast', 'A10T', TYPE_TABLET ),
 			'P72'										=> array( 'Teclast', 'P72', TYPE_TABLET ),
+			'P75HD(M3E5)'								=> array( 'Teclast', 'P75HD', TYPE_TABLET ),
+			'Teclast P76e!'								=> array( 'Teclast', 'P76e', TYPE_TABLET ),
 			'P76TI'										=> array( 'Teclast', 'P76Ti', TYPE_TABLET ),
 			'P81HD'										=> array( 'Teclast', 'P81HD', TYPE_TABLET ),
+			'P85(A9D3)'									=> array( 'Teclast', 'P85', TYPE_TABLET ),
 			'P85(R8A1)'									=> array( 'Teclast', 'P85', TYPE_TABLET ),
-			'Teclast P85'								=> array( 'Teclast', 'P85', TYPE_TABLET ),
+			'Teclast P85!'								=> array( 'Teclast', 'P85', TYPE_TABLET ),
 			'T720 SE'									=> array( 'Teclast', 'T720', TYPE_TABLET ),
 			'T760 from moage.com'						=> array( 'Teclast', 'T760', TYPE_TABLET ),
 			'tegav2'									=> array( 'Tegatech', 'TEGA v2', TYPE_TABLET ),
+			'TM-7024'									=> array( 'teXet', 'TM-7024', TYPE_TABLET ),
 			'TM-7025'									=> array( 'teXet', 'TM-7025', TYPE_TABLET ),
+			'TM-7037W'									=> array( 'teXet', 'TM-7037W', TYPE_TABLET ),
+			'TM-8041HD'									=> array( 'teXet', 'TM-8041HD', TYPE_TABLET ),
 			'MoFing'									=> array( 'Thomson', 'MoFing', TYPE_TABLET ),
 			'Ultimate10'								=> array( 'Tomtec', 'Ultimate10', TYPE_TABLET ),
 			'ThL V7'									=> array( 'THL', 'V7' ),
@@ -2099,6 +2709,12 @@ class DeviceModels {
 			'ThL V12'									=> array( 'THL', 'V12' ),
 			'ThL W1'									=> array( 'THL', 'W1' ),
 			'ThL W3'									=> array( 'THL', 'W3' ),
+			'ThL W3dc'									=> array( 'THL', 'W3' ),
+			'ThL W5'									=> array( 'THL', 'W5' ),
+			'ThL W7'									=> array( 'THL', 'W7' ),
+			'ThL W8'									=> array( 'THL', 'W8' ),
+			'TOOKY T83'									=> array( 'Tooky', 'T83' ),
+			'TOOKY T1982'								=> array( 'Tooky', 'T1982' ),
 			'TSB CLOUD COMPANION;TOSHIBA AC AND AZ'		=> array( 'Toshiba', 'Dynabook AZ', 'desktop' ),
 			'TOSHIBA AC AND AZ'							=> array( 'Toshiba', 'Dynabook AZ', 'desktop' ),
 			'TOSHIBA FOLIO AND A'						=> array( 'Toshiba', 'Folio 100', TYPE_TABLET ),
@@ -2111,7 +2727,10 @@ class DeviceModels {
 			'Tostab03'									=> array( 'Toshiba', 'Regza AT100', TYPE_TABLET ),
 			'AT100'										=> array( 'Toshiba', 'Regza AT100', TYPE_TABLET ),
 			'AT200'										=> array( 'Toshiba', 'Regza AT200', TYPE_TABLET ),
+			'AT270'										=> array( 'Toshiba', 'Regza AT270', TYPE_TABLET ),
 			'AT300'										=> array( 'Toshiba', 'Regza AT300', TYPE_TABLET ),
+			'AT300SE'									=> array( 'Toshiba', 'Regza AT300SE', TYPE_TABLET ),
+			'AT330'										=> array( 'Toshiba', 'Regza AT330', TYPE_TABLET ),
 			'AT470'										=> array( 'Toshiba', 'Regza AT470', TYPE_TABLET ),
 			'AT500'										=> array( 'Toshiba', 'Regza AT500', TYPE_TABLET ),
 			'AT570'										=> array( 'Toshiba', 'Regza AT570', TYPE_TABLET ),
@@ -2119,10 +2738,13 @@ class DeviceModels {
 			'Folio 100'									=> array( 'Toshiba', 'Folio 100', TYPE_TABLET ),
 			'folio100'									=> array( 'Toshiba', 'Folio 100', TYPE_TABLET ),
 			'THRiVE'									=> array( 'Toshiba', 'THRiVE', TYPE_TABLET ),
+			'TRACER OXYGEN GS1'							=> array( 'Tracer', 'Oxygen GS1' ),
+			'TREQ A10C'									=> array( 'Treq', 'A10C', TYPE_TABLET ),
 			'Fantastic T3'								=> array( 'TWM', 'Fantastic T3' ),
 			'TB100'										=> array( 'Unitech', 'TB100', TYPE_TABLET ),
 			'M70014'									=> array( 'United Star Technology', 'M70014', TYPE_TABLET ),
 			'UMI X1'									=> array( 'UMI', 'X1' ),
+			'U1203'										=> array( 'Uniscope', 'U1203' ),
 			'PS47'										=> array( 'Velocity Micro', 'Cruz PS47', TYPE_TABLET ),
 			'T301'										=> array( 'Velocity Micro', 'Cruz T301', TYPE_TABLET ),
 			'Vibo-A688'									=> array( 'FIH', 'Vibo A688' ),
@@ -2132,18 +2754,36 @@ class DeviceModels {
 			'TeamDRH ICS for GTablet'					=> array( 'ViewSonic', 'gTablet', TYPE_TABLET ),
 			'ViewPad7'									=> array( 'ViewSonic', 'ViewPad 7', TYPE_TABLET ),
 			'ViewPad 10e'								=> array( 'ViewSonic', 'ViewPad 10e', TYPE_TABLET ),
+			'ViewPad 10S'								=> array( 'ViewSonic', 'ViewPad 10s', TYPE_TABLET ),
+			'ViewPad97A'								=> array( 'ViewSonic', 'ViewPad 97a', TYPE_TABLET ),
+			'VSD220'									=> array( 'ViewSonic', 'VSD220', TYPE_DESKTOP ),
 			'VINUS V8'									=> array( 'Vinus', 'V8' ),
 			'vivo E1'									=> array( 'Vivo', 'E1' ),
+			'vivo E3'									=> array( 'Vivo', 'E3' ),
+			'vivo S1'									=> array( 'Vivo', 'S1' ),
+			'vivo S3'									=> array( 'Vivo', 'S3' ),
+			'vivo S3+'									=> array( 'Vivo', 'S3+' ),
+			'vivo S6'									=> array( 'Vivo', 'S6' ),
+			'vivo S6T'									=> array( 'Vivo', 'S6T' ),
 			'vivo S7'									=> array( 'Vivo', 'S7' ),
+			'vivo S9'									=> array( 'Vivo', 'S9' ),
+			'vivo S11t'									=> array( 'Vivo', 'S11' ),
+			'vivo S12'									=> array( 'Vivo', 'S12' ),
+			'vivo V1'									=> array( 'Vivo', 'V1' ),
 			'vivo V2'									=> array( 'Vivo', 'V2' ),
 			'vivo X1'									=> array( 'Vivo', 'X1' ),
+			'vivo Y3t'									=> array( 'Vivo', 'Y3T' ),
 			'VTAB1008'									=> array( 'Vizio', 'VTAB1008', TYPE_TABLET ),
 			'VTAB3010'									=> array( 'Vizio', 'VTAB3010', TYPE_TABLET ),
 			'VOTO W5300'								=> array( 'VOTO', 'W5300' ),
 			'Vsun i9'									=> array( 'Vsun Mobile', 'i9' ),
 			'xPAD-70'									=> array( 'WayteQ', 'xPAD-70', TYPE_TABLET ),
-			'xTAB-70'									=> array( 'WayteQ', 'xTAB-70', TYPE_TABLET ),
+			'xTAB-70!'									=> array( 'WayteQ', 'xTAB-70', TYPE_TABLET ),
 			'WellcoM-A99'								=> array( 'WellcoM', 'A99' ),
+			'WellcoM-A800'								=> array( 'WellcoM', 'A800', TYPE_TABLET ),
+			'WEXLER-TAB-7T'								=> array( 'Wexler', 'Tab 7T', TYPE_TABLET ),
+			'CINK KING'									=> array( 'Wiko', 'Cink King' ),
+			'CINK PEAX'									=> array( 'Wiko', 'Cink Peax' ),
 			'WIKO-CINK SLIM'							=> array( 'Wiko', 'Cink Slim' ),
 			'N5PRO2jingying'							=> array( 'Window', 'N5 Pro 2', TYPE_MEDIA ),
 			'N12'										=> array( 'Window', 'N12', TYPE_TABLET ),
@@ -2153,17 +2793,23 @@ class DeviceModels {
 			'N50GT'										=> array( 'Window', 'N50GT', TYPE_TABLET ),
 			'N50GT A'									=> array( 'Window', 'N50GT-A', TYPE_TABLET ),
 			'N70'										=> array( 'Window', 'N70', TYPE_TABLET ),
+			'N70DC'										=> array( 'Window', 'N70DC', TYPE_TABLET ),
 			'N70-S'										=> array( 'Window', 'N70S', TYPE_TABLET ),
 			'N70HD'										=> array( 'Window', 'N70HD', TYPE_TABLET ),
 			'N70 DUAL CORE'								=> array( 'Window', 'N70 Dual Core', TYPE_TABLET ),
+			'N70DC-S'									=> array( 'Window', 'N70 Dual Core', TYPE_TABLET ),
 			'N70DC-T'									=> array( 'Window', 'N70 Dual Core', TYPE_TABLET ),
 			'N80($| from moage.com)!'					=> array( 'Window', 'N80', TYPE_TABLET ),
 			'N80DC'										=> array( 'Window', 'N80 Dual Core', TYPE_TABLET ),
+			'N80IPS'									=> array( 'Window', 'N80 IPS', TYPE_TABLET ),
 			'N90'										=> array( 'Window', 'N90', TYPE_TABLET ),
 			'N90 DUAL CORE!'							=> array( 'Window', 'N90 Dual Core', TYPE_TABLET ),
 			'N101 DUAL CORE!'							=> array( 'Window', 'N101 Dual Core', TYPE_TABLET ),
 			'N612'										=> array( 'Wishway', 'N612' ),
+			'A81E'										=> array( 'Witstech', 'A81E', TYPE_TABLET ),
 			'AT-AS43D'									=> array( 'Wolfgang', 'AT-AS43D' ),
+			'AT-AS43D2'									=> array( 'Wolfgang', 'AT-AS43D2' ),
+			'AT-AS45SE'									=> array( 'Wolfgang', 'AT-AS45SE' ),
 			'M12'										=> array( 'Wopad', 'M12', TYPE_TABLET ),
 			'WM8650'									=> array( 'WonderMedia', 'WM8650', TYPE_TABLET ),
 			'WM8850-mid'								=> array( 'WonderMedia', 'WM8850', TYPE_TABLET ),
@@ -2171,10 +2817,13 @@ class DeviceModels {
 			'MI 1S'										=> array( 'Xiaomi', 'MI-ONE S' ),
 			'MI 1SC'									=> array( 'Xiaomi', 'MI-ONE SC' ),
 			'MI-ONE C1'									=> array( 'Xiaomi', 'MI-ONE C1' ),
-			'MI-ONE Plus'								=> array( 'Xiaomi', 'MI-ONE Plus' ),
+			'MI-ONE Plus!'								=> array( 'Xiaomi', 'MI-ONE Plus' ),
 			'mione plus'								=> array( 'Xiaomi', 'MI-ONE Plus' ),
 			'MI 2'										=> array( 'Xiaomi', 'MI-TWO' ),
+			'MI 2C'										=> array( 'Xiaomi', 'MI-TWO' ),
 			'MI-TWO'									=> array( 'Xiaomi', 'MI-TWO' ),
+			'X403'										=> array( 'Xtouch', 'X403' ),
+			'X506'										=> array( 'Xtouch', 'X506' ),
 			'Q07CL01'									=> array( 'XVision', 'Q07', TYPE_TABLET ),
 			'N6'										=> array( 'Yarvik', 'TAB210 Tablet', TYPE_TABLET ),
 			'TAB224'									=> array( 'Yarvik', 'TAB224 GoTab Velocity', TYPE_TABLET ),
@@ -2219,16 +2868,20 @@ class DeviceModels {
 			'ZTE V788!'									=> array( 'ZTE', 'V788 Kis' ),
 			'ZTE U788!'									=> array( 'ZTE', 'U788 Kis' ),
 			'ZTE U790'									=> array( 'ZTE', 'U790' ),
+			'ZTE V790'									=> array( 'ZTE', 'V790' ),
+			'ZTE V791'									=> array( 'ZTE', 'V791' ),
+			'ZTE V793'									=> array( 'ZTE', 'V793' ),
 			'ZTE U795'									=> array( 'ZTE', 'U795' ),
 			'ZTE T U802'								=> array( 'ZTE', 'U802' ),
 			'RacerII'									=> array( 'ZTE', 'U806 Racer II' ),
 			'ZTE T U806'								=> array( 'ZTE', 'U806 Racer II' ),
+			'ZTE U807'									=> array( 'ZTE', 'U807' ),
 			'E810'										=> array( 'ZTE', 'E810' ),
 			'ZTE T U812'								=> array( 'ZTE', 'U812' ),
+			'ZTE U817'									=> array( 'ZTE', 'U817' ),
 			'ZTE GV821'									=> array( 'ZTE', 'V821' ),
 			'ZTE T U830'								=> array( 'ZTE', 'U830' ),		
 			'ZTE Racer'									=> array( 'ZTE', 'X850 Racer' ),
-			'MTC 916'									=> array( 'ZTE', 'X850 Racer' ),
 			'Racer'										=> array( 'ZTE', 'X850 Racer' ),
 			'ZTE U X850'								=> array( 'ZTE', 'X850 Racer' ),
 			'ZTE U V852'								=> array( 'ZTE', 'V852 Dreamer' ),
@@ -2251,7 +2904,9 @@ class DeviceModels {
 			'Blade(-V880|-opda)?$!'						=> array( 'ZTE', 'V880 Blade' ),
 			'ZTE N880E'									=> array( 'ZTE', 'N880E' ),
 			'ZTE N880F'									=> array( 'ZTE', 'N880F' ),
+			'ZTE N880G'									=> array( 'ZTE', 'N880G' ),
 			'ZTE N881E'									=> array( 'ZTE', 'N881E' ),
+			'ZTE N881F'									=> array( 'ZTE', 'N881F' ),
 			'BLADEII'									=> array( 'ZTE', 'V881 Blade II' ),
 			'Blade2'									=> array( 'ZTE', 'V881 Blade II' ),
 			'ZTE U V881'								=> array( 'ZTE', 'V881 Blade II' ),		
@@ -2268,6 +2923,7 @@ class DeviceModels {
 			'ZTE Grand X'								=> array( 'ZTE', 'U930 Grand X' ),
 			'Grand X In'								=> array( 'ZTE', 'U930 Grand X' ),
 			'ZTE U930 Ultimate'							=> array( 'ZTE', 'U930 Grand X' ),
+			'ZTE U935'									=> array( 'ZTE', 'U935' ),
 			'ZTE U950'									=> array( 'ZTE', 'U950' ),
 			'ZTE V955'									=> array( 'ZTE', 'V955' ),
 			'ZTE (U )?V960!'							=> array( 'ZTE', 'V960 Skate' ),
@@ -2276,18 +2932,30 @@ class DeviceModels {
 			'ZTE U960s3'								=> array( 'ZTE', 'U960s3' ),
 			'ZTE N970'									=> array( 'ZTE', 'N970 Grand X' ),
 			'ZTE U970'									=> array( 'ZTE', 'U970 Grand X' ),
-			'ZTE V970'									=> array( 'ZTE', 'Z970 Grand X' ),
+			'ZTE V970!'									=> array( 'ZTE', 'Z970 Grand X' ),
+			'ZTE N983'									=> array( 'ZTE', 'N983' ),
+			'Grand X Pro'								=> array( 'ZTE', 'V983 Grand X Pro' ),
 			'ZTE U985'									=> array( 'ZTE', 'U985 Grand Era' ),
+			'ZTE V985'									=> array( 'ZTE', 'V985 Grand Era' ),
+			'ZTE V987'									=> array( 'ZTE', 'V987' ),
 			'ZTE Roamer'								=> array( 'ZTE', 'Z990 Roamer ' ),
 			'ZTE Z990!'									=> array( 'ZTE', 'Z990 Roamer' ),
+			'V8000 USA Cricket'							=> array( 'ZTE', 'V8000 Engage' ),
+			'X501 USA Cricket'							=> array( 'ZTE', 'X501 Groove' ),
+			'ZXY-ZTE V6700'								=> array( 'ZTE', 'V6700' ),
+			'N9100'										=> array( 'ZTE', 'N9100 Force' ),
+			'ZTE N9120'									=> array( 'ZTE', 'N9120 Avid' ),
 			'N9500'										=> array( 'ZTE', 'N9500 Flash' ),
 			'003Z'										=> array( 'ZTE', 'Softbank 003Z' ),
 			'008Z'										=> array( 'ZTE', 'Softbank 008Z' ),
 			'009Z'										=> array( 'ZTE', 'Softbank Star7' ),
-			'ZP100'										=> array( 'Zopo', 'ZP100' ),
-			'ZP200'										=> array( 'Zopo', 'ZP200' ),
-			'ZP300'										=> array( 'Zopo', 'ZP300' ),
-			'ZP500'										=> array( 'Zopo', 'ZP500' ),
+			'(Zopo )?ZP100!'							=> array( 'Zopo', 'ZP100 Pilot' ),
+			'ZP200'										=> array( 'Zopo', 'ZP200 Shining' ),
+			'ZP300'										=> array( 'Zopo', 'ZP300 Field' ),
+			'ZP300+'									=> array( 'Zopo', 'ZP300 Field Plus' ),
+			'ZP500'										=> array( 'Zopo', 'ZP500 Libero' ),
+			'(Zopo )?ZP900!'							=> array( 'Zopo', 'ZP900 Leader' ),
+			'ZP950'										=> array( 'Zopo', 'ZP950 Phablet' ),
 	
 			/* Telecom provider branded devices */
 			'i-mobile i691'								=> array( 'i-Mobile', 'i691' ),
@@ -2295,14 +2963,24 @@ class DeviceModels {
 			'i-mobile i858'								=> array( 'i-Mobile', 'i858' ),
 			'i-mobile 3G 8500'							=> array( 'i-Mobile', '3G 8500' ),
 			'i-mobile IQ 1'								=> array( 'i-Mobile', 'iQ 1' ),	
+			'i-mobile IQ 2'								=> array( 'i-Mobile', 'iQ 2' ),	
+			'i-mobile IQ 2A'							=> array( 'i-Mobile', 'iQ 2A' ),	
+			'i-mobile IQ 5'								=> array( 'i-Mobile', 'iQ 5' ),	
+			'i-mobile IQ 6'								=> array( 'i-Mobile', 'iQ 6' ),	
+			'i-mobile IQ 6A'							=> array( 'i-Mobile', 'iQ 6A' ),	
+			'i-STYLE 1'									=> array( 'i-Mobile', 'i-Style 1' ),	
 			'i-mobile i-style 3'						=> array( 'i-Mobile', 'i-Style 3' ),	
+			'i-mobile i-STYLE 4'						=> array( 'i-Mobile', 'i-Style 4' ),	
+			'i-MOBILE i-STYLE 5'						=> array( 'i-Mobile', 'i-Style 5' ),	
 			'i-mobile i-style Q1'						=> array( 'i-Mobile', 'i-Style Q1' ),						
 			'i-mobile i-STYLE Q2'						=> array( 'i-Mobile', 'i-Style Q2' ),			
 			'i-mobile i-STYLE Q2 DUO'					=> array( 'i-Mobile', 'i-Style Q2 Duo' ),
+			'i-STYLE Q2 DUO'							=> array( 'i-Mobile', 'i-Style Q2 Duo' ),
 			'i-mobile i-style Q3'						=> array( 'i-Mobile', 'i-Style Q3' ),				
 			'i-mobile i-STYLE Q6'						=> array( 'i-Mobile', 'i-Style Q6' ),						
 			'i-mobile I-Note'							=> array( 'i-Mobile', 'i-Note', TYPE_TABLET ),
 			'i-mobile i-note WiFi 7'					=> array( 'i-Mobile', 'i-Note 7', TYPE_TABLET ),
+			'i-mobile i-note WiFi 9'					=> array( 'i-Mobile', 'i-Note 9', TYPE_TABLET ),
 	
 			'Etisalat Smartphone'						=> array( 'Etisalat', 'Smartphone' ),	
 			
@@ -2311,6 +2989,7 @@ class DeviceModels {
 			'Optimus Monte Carlo'						=> array( 'Optimus', 'Monte Carlo' ),						/* ZTE Skate */
 			
 			'Orange Boston'								=> array( 'Orange', 'Boston' ),								/* Gigabyte GSmart G1305 */
+			'Orange Daytona'							=> array( 'Orange', 'Daytona' ),						
 			'Orange Monte Carlo'						=> array( 'Orange', 'Monte Carlo' ),						/* ZTE Skate */
 			'San Francisco'								=> array( 'Orange', 'San Francisco' ),						/* ZTE Blade */
 			'San Francisco for Orange'					=> array( 'Orange', 'San Francisco' ),						/* ZTE Blade */
@@ -2338,18 +3017,35 @@ class DeviceModels {
 			'T-Mobile myTouch Q'						=> array( 'T-Mobile', 'myTouch Q' ),						/* Huawei U8730 */
 			'LG-C800'									=> array( 'T-Mobile', 'myTouch Q' ),
 			'Pulse Mini'								=> array( 'T-Mobile', 'Pulse Mini' ),						/* Huawei U8110 */
+			'T-Mobile Vivacity'							=> array( 'T-Mobile', 'Vivacity' ),				
+			
+			'Telenor OneTouch'							=> array( 'Telenor', 'One Touch' ),
+			'Telenor One Touch S'						=> array( 'Telenor', 'One Touch S' ),
+			'Telenor Touch Plus'						=> array( 'Telenor', 'Touch Plus' ),
 			
 			'Turkcell Maxi Plus 5'						=> array( 'Turkcell', 'Maxi Plus 5' ),
 			'Turkcell T20'								=> array( 'Turkcell', 'T20' ),
 		
+			'MTC 916'									=> array( 'MTC', '916' ),
 			'MTC 950'									=> array( 'MTC', '950' ),
 			'MTC 955'									=> array( 'MTC', '955' ),
 			'MTC 960'									=> array( 'MTC', '960' ),
 			'MTC Evo'									=> array( 'MTC', 'Evo' ),
+			'MTC Neo'									=> array( 'MTC', 'Neo' ),
+			'MTC Viva'									=> array( 'MTC', 'Viva' ),
+			
+			'QMobile A7'								=> array( 'Q-Mobile', 'Noir A7' ),
+			'QMobile A8'								=> array( 'Q-Mobile', 'Noir A8' ),
+			'Qmobile-S11'								=> array( 'Q-Mobile', 'S11' ),
+			'Q-Smart S18'								=> array( 'Q-Mobile', 'Q-Smart S18' ),
+			'Q-Smart S20'								=> array( 'Q-Mobile', 'Q-Smart S20' ),
 			
 			'Vodafone 845'								=> array( 'Vodafone', '845 Nova' ),							/* Huawei U8100 */
 			'Vodafone 858'								=> array( 'Vodafone', '858 Smart' ),						/* Huawei U8160 */
+			'Vodafone 861'								=> array( 'Vodafone', '861 Smart' ),
 			'Vodafone 945'								=> array( 'Vodafone', '945' ),								/* ZTE Joe */
+			'Vodafone 958'								=> array( 'Vodafone', '958' ),
+			'Vodafone Smart ll'							=> array( 'Vodafone', 'Smart II' ),
 			'Vodafone Smart II'							=> array( 'Vodafone', 'Smart II' ),
 			'SmartTabII7'								=> array( 'Vodafone', 'SmartTab II 7', TYPE_TABLET ),		/* Lenovo */
 			'SmartTab10'								=> array( 'Vodafone', 'SmartTab 10', TYPE_TABLET )			/* ZTE Web Tab 10 */
@@ -2372,6 +3068,7 @@ class DeviceModels {
 			'Coolpad D508'								=> array( 'Coolpad', 'D508' ),
 			'Coolpad E600'								=> array( 'Coolpad', 'E600' ),
 			'SCH-F839'									=> array( 'Samsung', 'SCH-F839' ),
+			'SCH-M519!'									=> array( 'Samsung', 'Metro TV' ),
 			'HS-E316!'									=> array( 'Hisense', 'E316' ),
 		);
 		
@@ -2479,17 +3176,20 @@ class DeviceModels {
 			'LG-E-?900!'								=> array( 'LG', 'Optimus 7 E900' ),
 			'LG-E906'									=> array( 'LG', 'Jil Sander' ),
 			'LG-C900!'									=> array( 'LG', 'Optimus 7Q' ),
-			'(Lumia ?|Nokia )?510!'						=> array( 'Nokia', 'Lumia 510' ),
-			'(Lumia ?|Nokia )?610!'						=> array( 'Nokia', 'Lumia 610' ),
-			'(Lumia ?|Nokia )?710!'						=> array( 'Nokia', 'Lumia 710' ),
+			'Lumia 505'									=> array( 'Nokia', 'Lumia 505' ),
+			'(Lumia ?|Nokia ?)?510!'					=> array( 'Nokia', 'Lumia 510' ),
+			'(Lumia ?|Nokia ?)?610!'					=> array( 'Nokia', 'Lumia 610' ),
+			'(Lumia ?|Nokia ?)?620!'					=> array( 'Nokia', 'Lumia 620' ),
+			'(Lumia ?|Nokia ?)?710!'					=> array( 'Nokia', 'Lumia 710' ),
 			'Lumia 719'									=> array( 'Nokia', 'Lumia 719' ),
-			'(Lumia ?|Nokia )?800!'						=> array( 'Nokia', 'Lumia 800' ),
+			'(Lumia ?|Nokia ?)?800!'					=> array( 'Nokia', 'Lumia 800' ),
 			'SeaRay'									=> array( 'Nokia', 'Lumia 800' ),
 			'Lumia ?810!'								=> array( 'Nokia', 'Lumia 810' ),
 			'Lumia ?820!'								=> array( 'Nokia', 'Lumia 820' ),
 			'Lumia ?822!'								=> array( 'Nokia', 'Lumia 822' ),
-			'(Lumia ?|Nokia )?900!'						=> array( 'Nokia', 'Lumia 900' ),
-			'(Lumia ?|Nokia )?920!'						=> array( 'Nokia', 'Lumia 920' ),
+			'(Lumia ?|Nokia ?)?900!'					=> array( 'Nokia', 'Lumia 900' ),
+			'(Lumia ?|Nokia ?)?920!'					=> array( 'Nokia', 'Lumia 920' ),
+			'RM-8(20|21)!'								=> array( 'Nokia', 'Lumia 920' ),
 			'GT-I8350!'									=> array( 'Samsung', 'Omnia W' ),
 			'GT-i8700'									=> array( 'Samsung', 'Omnia 7' ),
 			'GT-I8750'									=> array( 'Samsung', 'Ativ S' ),
@@ -2512,7 +3212,7 @@ class DeviceModels {
 		);
 		
 		static $S40_MODELS = array(
-			'C1-01'										=> array( 'Nokia', 'C1-01' ),
+			'C1-01!'									=> array( 'Nokia', 'C1-01' ),
 			'C1-02'										=> array( 'Nokia', 'C1-02' ),
 			'C2-00'										=> array( 'Nokia', 'C2-00' ),
 			'C2-01'										=> array( 'Nokia', 'C2-01' ),
@@ -2541,8 +3241,9 @@ class DeviceModels {
 			'303'										=> array( 'Nokia', 'Asha 303' ),
 			'305'										=> array( 'Nokia', 'Asha 305' ),
 			'306'										=> array( 'Nokia', 'Asha 306' ),
-			'309'										=> array( 'Nokia', 'Asha 309' ),
 			'308'										=> array( 'Nokia', 'Asha 308' ),
+			'309'										=> array( 'Nokia', 'Asha 309' ),
+			'310'										=> array( 'Nokia', 'Asha 311' ),
 			'311'										=> array( 'Nokia', 'Asha 311' ),
 			'1682c'										=> array( 'Nokia', '1682 classic' ),
 			'2220s!'									=> array( 'Nokia', '2220 slide' ),
@@ -2584,6 +3285,7 @@ class DeviceModels {
 			'7070!'										=> array( 'Nokia', '7070 Prism' ),
 			'7100s!'									=> array( 'Nokia', '7100 Supernova' ),
 			'7210s!'									=> array( 'Nokia', '7210 Supernova' ),
+			'7210Supernova!'							=> array( 'Nokia', '7210 Supernova' ),					
 			'7230'										=> array( 'Nokia', '7230' ),
 			'7310c!'									=> array( 'Nokia', '7310 Supernova' ),
 			'7510Supernova!'							=> array( 'Nokia', '7510 Supernova' ),
@@ -2707,17 +3409,27 @@ class DeviceModels {
 		);
 		
 		static $FEATURE_MODELS = array(
+			'J105i'										=> array( 'Sony Ericsson', 'Naite' ),
 			'J108[ai]!'									=> array( 'Sony Ericsson', 'Cedar' ),
+			'J10i2'										=> array( 'Sony Ericsson', 'Elm' ),
 			'J20'										=> array( 'Sony Ericsson', 'Hazel' ),
 			'KC910i'									=> array( 'LG', 'KC910i Renoir' ),
 			'KP500!'									=> array( 'LG', 'KP500 Cookie' ),
+			'KU990i'									=> array( 'LG', 'KU990 Viewty' ),
+			'GM360'										=> array( 'LG', 'GM360 Viewty Snap' ),
 			'GS500'										=> array( 'LG', 'GS500 Cookie Plus' ),
+			'GT550'										=> array( 'LG', 'GT550 Encore' ),
+			'GT-C3322'									=> array( 'Samsung', 'GT-C3322 Duos' ),
+			'GT-E2152'									=> array( 'Samsung', 'GT-E2152 Duos' ),
 			'GT-S3350'									=> array( 'Samsung', 'Ch@t 335' ),
 			'GT-S3570'									=> array( 'Samsung', 'Ch@t 357' ),
-			'GT-S5610K'									=> array( 'Samsung', 'Primo' ),
+			'GT-S5229'									=> array( 'Samsung', 'Tocco Lite 2' ),
+			'GT-S5610!'									=> array( 'Samsung', 'Primo' ),
 			'SGH-A667'									=> array( 'Samsung', 'A667 Evergreen' ),
+			'SGH-A877'									=> array( 'Samsung', 'A877 Impression' ),
+			'SGH-S390G'									=> array( 'Samsung', 'S390 TracFone' )
 		);
-
+		
 		static $BLACKBERRY_MODELS = array(
 			'9000'		=> 'Bold',
 			'9600'		=> 'Bold',
@@ -2752,6 +3464,7 @@ class DeviceModels {
 			'8230'		=> 'Pearl',
 			'9100'		=> 'Pearl',
 			'9105'		=> 'Pearl',
+			'9500'		=> 'Storm',
 			'9530'		=> 'Storm',
 			'9550'		=> 'Storm',
 			'9670'		=> 'Style',
@@ -2851,6 +3564,7 @@ function cleanup($s = '') {
 			$s = preg_replace('/^tita on /', '', $s);
 			$s = preg_replace('/^ICS AOSP on /', '', $s);
 			$s = preg_replace('/^Android (on |for )/', '', $s);
+			$s = preg_replace('/^Generic Android on /', '', $s);
 			$s = preg_replace('/^Full (AOSP on |Android on |Cappuccino on |MIPS Android on |Android)/', '', $s);
 
 			$s = preg_replace('/^Acer( |-)?/i', '', $s);
@@ -2866,6 +3580,7 @@ function cleanup($s = '') {
 			$s = preg_replace('/^HW-/', '', $s);
 			$s = preg_replace('/^Huawei[ -]/i', 'Huawei ', $s);
 			$s = preg_replace('/^SAMSUNG[ -]/i', '', $s);
+			$s = preg_replace('/^SAMSUNG SAMSUNG-/i', '', $s);
 			$s = preg_replace('/^(Sony ?Ericsson|Sony)/', '', $s);
 			$s = preg_replace('/^(Lenovo Lenovo|LNV-Lenovo|LENOVO-Lenovo)/', 'Lenovo', $s);
 			$s = preg_replace('/^Lenovo-/', 'Lenovo', $s);

From 3d1b33d4e96e36bf2504de079ccbffbca187907f Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:50:38 +0200
Subject: [PATCH 139/174] If we detect Puffin using a header, set the browser
 to Puffin

---
 scripts/useragents/useragents.lib.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/useragents/useragents.lib.php b/scripts/useragents/useragents.lib.php
index f9df98ec..aba82011 100644
--- a/scripts/useragents/useragents.lib.php
+++ b/scripts/useragents/useragents.lib.php
@@ -3702,6 +3702,12 @@ function analyseUCUserAgent($ua) {
 		function analysePuffinUserAgent($ua) {
 			$parts = explode('/', $ua);
 			
+			if ($this->browser->name != 'Puffin') {
+				$this->browser->name = 'Puffin';
+				$this->browser->version = null;
+				$this->browser->stock = false;
+			}
+		
 			$this->device->type = 'mobile';
 			
 			if (count($parts) > 1 && $parts[0] == 'Android') {

From 7838cba7545434cb90c40c1f3465ae32ae6c50a9 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:51:31 +0200
Subject: [PATCH 140/174] Expand iOS device detection to include models for
 Puffin

---
 scripts/useragents/useragents.lib.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/scripts/useragents/useragents.lib.php b/scripts/useragents/useragents.lib.php
index aba82011..10a76309 100644
--- a/scripts/useragents/useragents.lib.php
+++ b/scripts/useragents/useragents.lib.php
@@ -3721,6 +3721,31 @@ function analysePuffinUserAgent($ua) {
 					$this->device = $device;
 				}
 			}
+
+			if (count($parts) > 1 && $parts[0] == 'iPhone OS') {
+				if (!isset($this->os->name) || $this->os->name != 'iOS') {
+					$this->os->name = 'iOS';
+					$this->os->version = null;
+				}
+				
+				if (preg_match('/iPod( touch)?/', $parts[1])) {
+					$this->device->type = TYPE_MEDIA;
+					$this->device->manufacturer = 'Apple';
+					$this->device->model = 'iPod touch';
+				} 
+				else if (preg_match('/(?:Unknown )?iPhone( 3G| 3GS| 4| 4S| 5)?/', $parts[1], $match)) {
+					$this->device->type = TYPE_MOBILE;
+					$this->device->manufacturer = 'Apple';
+					$this->device->model = 'iPhone' . (isset($match[1]) ? $match[1] : '');
+				} 
+				else if (preg_match('/iPad/', $parts[1])) {
+					$this->device->type = TYPE_TABLET;
+					$this->device->manufacturer = 'Apple';
+					$this->device->model = 'iPad';
+				}
+				
+				$this->device->identified = true;
+			}
 		}
 		
 		function analyseUserAgent($ua) {

From 6d1ca2046e49b78fa4f514074a87f9344253b96d Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:52:09 +0200
Subject: [PATCH 141/174] Also allow WindowsMobile without a space

---
 scripts/useragents/useragents.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/useragents/useragents.lib.php b/scripts/useragents/useragents.lib.php
index 10a76309..b839aedf 100644
--- a/scripts/useragents/useragents.lib.php
+++ b/scripts/useragents/useragents.lib.php
@@ -4075,7 +4075,7 @@ function analyseUserAgent($ua) {
 					$this->device->type = TYPE_MOBILE;
 				}
 
-				if (preg_match('/Windows Mobile/', $ua)) {
+				if (preg_match('/Windows ?Mobile/', $ua)) {
 					$this->os->name = 'Windows Mobile';
 					$this->device->type = TYPE_MOBILE;
 				}

From cfe01ecbbbe81d1633f10abbaab599e5f619f339 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:53:12 +0200
Subject: [PATCH 142/174] Even more devices for the database

---
 scripts/useragents/useragents.lib.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/useragents/useragents.lib.php b/scripts/useragents/useragents.lib.php
index b839aedf..dbd73ef5 100644
--- a/scripts/useragents/useragents.lib.php
+++ b/scripts/useragents/useragents.lib.php
@@ -1176,6 +1176,7 @@ class DeviceModels {
 			'Ascend G300'								=> array( 'Huawei', 'Ascend G300' ),
 			'Huawei G510!'								=> array( 'Huawei', 'Ascend G510' ),
 			'Huawei G520-5000'							=> array( 'Huawei', 'Ascend G520' ),
+			'Huawei Y210!'								=> array( 'Huawei', 'Ascend Y210' ),
 			'Huawei Y 220T'								=> array( 'Huawei', 'Ascend Y220T' ),
 			'Huawei Y300!'								=> array( 'Huawei', 'Ascend Y300' ),
 			'Huawei Y310!'								=> array( 'Huawei', 'Ascend Y310' ),
@@ -2177,11 +2178,11 @@ class DeviceModels {
 			'GT-I91(00|08)!'							=> array( 'Samsung', 'Galaxy S II' ),
 			'GT-I9103!'									=> array( 'Samsung', 'Galaxy R' ),
 			'GT-I9105!'									=> array( 'Samsung', 'Galaxy S II Plus' ),
-			'GT-I9150!'									=> array( 'Samsung', 'Galaxy "Fonblet 5.8"' ),
-			'GT-I9152!'									=> array( 'Samsung', 'Galaxy "Fonblet 5.8" Duos' ),
+			'GT-I9150!'									=> array( 'Samsung', 'Galaxy Mega 5.8' ),
+			'GT-I9152!'									=> array( 'Samsung', 'Galaxy Mega 5.8 Duos' ),
 			'GT-I9190!'									=> array( 'Samsung', 'Galaxy S4 Mini' ),
-			'GT-I9200!'									=> array( 'Samsung', 'Galaxy S II' ),
-			'GT-I9205'									=> array( 'Samsung', 'Galaxy "Fonblet 6.3"' ),
+			'GT-I9200!'									=> array( 'Samsung', 'Galaxy Mega 6.3' ),
+			'GT-I9205'									=> array( 'Samsung', 'Galaxy Mega 6.3' ),
 			'GT-I9210!'									=> array( 'Samsung', 'Galaxy S II LTE' ),
 			'GT-I92(20|28)!'							=> array( 'Samsung', 'Galaxy Note' ),
 			'GT-I9250!'									=> array( 'Samsung', 'Galaxy Nexus' ),

From 7103f41d1009ff2c317a54ee6139fa272ac933d6 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:54:35 +0200
Subject: [PATCH 143/174] Clean up the version of certain HP webOS devices

---
 scripts/useragents/useragents.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/useragents/useragents.lib.php b/scripts/useragents/useragents.lib.php
index dbd73ef5..017f355b 100644
--- a/scripts/useragents/useragents.lib.php
+++ b/scripts/useragents/useragents.lib.php
@@ -4364,7 +4364,7 @@ function analyseUserAgent($ua) {
 			 *		WebOS
 			 */
 		
-			if (preg_match('/(?:web|hpw)OS\/([0-9.]*)/', $ua, $match)) {
+			if (preg_match('/(?:web|hpw)OS\/(?:HP webOS )?([0-9.]*)/', $ua, $match)) {
 				$this->os->name = 'webOS';
 				$this->os->version = new Version(array('value' => $match[1], 'details' => 2));
 				$this->device->type = preg_match('/Tablet/', $ua) ? TYPE_TABLET : TYPE_MOBILE;

From 34f17f49136624f53deb76ebdeaf6f84c48a8a61 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:55:08 +0200
Subject: [PATCH 144/174] Detect tablets using an case-insensitive string

---
 scripts/useragents/useragents.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/useragents/useragents.lib.php b/scripts/useragents/useragents.lib.php
index 017f355b..459b7143 100644
--- a/scripts/useragents/useragents.lib.php
+++ b/scripts/useragents/useragents.lib.php
@@ -4367,7 +4367,7 @@ function analyseUserAgent($ua) {
 			if (preg_match('/(?:web|hpw)OS\/(?:HP webOS )?([0-9.]*)/', $ua, $match)) {
 				$this->os->name = 'webOS';
 				$this->os->version = new Version(array('value' => $match[1], 'details' => 2));
-				$this->device->type = preg_match('/Tablet/', $ua) ? TYPE_TABLET : TYPE_MOBILE;
+				$this->device->type = preg_match('/Tablet/i', $ua) ? TYPE_TABLET : TYPE_MOBILE;
 
 				if (preg_match('/Pre\/1.0/', $ua)) $this->device->model = 'Pre';
 				if (preg_match('/Pre\/1.1/', $ua)) $this->device->model = 'Pre Plus';

From 21efac4add91e74be162b282c425da1d5ca66ad3 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:55:26 +0200
Subject: [PATCH 145/174] Added MAUI Runtime

---
 scripts/useragents/useragents.lib.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/scripts/useragents/useragents.lib.php b/scripts/useragents/useragents.lib.php
index 459b7143..f2344d3f 100644
--- a/scripts/useragents/useragents.lib.php
+++ b/scripts/useragents/useragents.lib.php
@@ -4589,6 +4589,15 @@ function analyseUserAgent($ua) {
 				$this->device->type = TYPE_MOBILE;
 			}
 
+			/****************************************************
+			 *		MAUI Runtime
+			 */
+		
+			if (preg_match('/\(MAUI Runtime;/', $ua)) {
+				$this->os->name = 'MAUI Runtime';
+				$this->device->type = TYPE_MOBILE;
+			}
+
 			/****************************************************
 			 *		CrOS
 			 */

From ddc9858941793e9f683fb636b605093e8750cbc6 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:55:38 +0200
Subject: [PATCH 146/174] Added BeOS

---
 scripts/useragents/useragents.lib.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/scripts/useragents/useragents.lib.php b/scripts/useragents/useragents.lib.php
index f2344d3f..4adb4aea 100644
--- a/scripts/useragents/useragents.lib.php
+++ b/scripts/useragents/useragents.lib.php
@@ -4617,6 +4617,15 @@ function analyseUserAgent($ua) {
 				$this->device->type = TYPE_DESKTOP;
 			}
 			
+			/****************************************************
+			 *		BeOS
+			 */
+		
+			if (preg_match('/BeOS/', $ua)) {
+				$this->os->name = 'BeOS';
+				$this->device->type = TYPE_DESKTOP;
+			}
+			
 			/****************************************************
 			 *		Haiku
 			 */

From 5f99c0a700f0ff88850e600bae470bcb7e83bce3 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:55:51 +0200
Subject: [PATCH 147/174] Added AROS

---
 scripts/useragents/useragents.lib.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/scripts/useragents/useragents.lib.php b/scripts/useragents/useragents.lib.php
index 4adb4aea..40ead6d2 100644
--- a/scripts/useragents/useragents.lib.php
+++ b/scripts/useragents/useragents.lib.php
@@ -4684,6 +4684,15 @@ function analyseUserAgent($ua) {
 				$this->device->type = TYPE_DESKTOP;
 			}
 			
+			/****************************************************
+			 *		AROS
+			 */
+		
+			if (preg_match('/AROS/', $ua, $match)) {
+				$this->os->name = 'AROS';
+				$this->device->type = TYPE_DESKTOP;
+			}
+			
 			/****************************************************
 			 *		Kindle
 			 */

From aacf0f2a80f253fbeb4d494bf18bc6cedd7a10b8 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:56:12 +0200
Subject: [PATCH 148/174] Added the Tesla Model S in-car browser

---
 scripts/useragents/useragents.lib.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/scripts/useragents/useragents.lib.php b/scripts/useragents/useragents.lib.php
index 40ead6d2..d9d119ff 100644
--- a/scripts/useragents/useragents.lib.php
+++ b/scripts/useragents/useragents.lib.php
@@ -4768,6 +4768,20 @@ function analyseUserAgent($ua) {
 				$this->device->identified = true;
 			}
 
+			/****************************************************
+			 *		Tesla Model S in-car browser
+			 */
+		
+			if (preg_match('/QtCarBrowser/', $ua)) {
+				$this->os->name = '';
+				
+				$this->device->manufacturer = 'Tesla';
+				$this->device->model = 'Model S';
+				$this->device->type = TYPE_CAR;
+				$this->device->identified = true;
+			}
+
+
 			/****************************************************
 			 *		Nintendo
 			 *

From 67b6474d7b0785c7cef4ac2c244163a6954369ea Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:56:40 +0200
Subject: [PATCH 149/174] Allow U tag in OS/2 ua

---
 scripts/useragents/useragents.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/useragents/useragents.lib.php b/scripts/useragents/useragents.lib.php
index d9d119ff..272c26a9 100644
--- a/scripts/useragents/useragents.lib.php
+++ b/scripts/useragents/useragents.lib.php
@@ -4648,7 +4648,7 @@ function analyseUserAgent($ua) {
 			 *		OS/2 Warp
 			 */
 		
-			if (preg_match('/OS\/2; Warp ([0-9.]*)/i', $ua, $match)) {
+			if (preg_match('/OS\/2; (?:U; )?Warp ([0-9.]*)/i', $ua, $match)) {
 				$this->os->name = 'OS/2 Warp';
 				$this->os->version = new Version(array('value' => $match[1]));
 				$this->device->type = TYPE_DESKTOP;

From 8cdcf1e57af13c4b986d098bf981970347883715 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:58:57 +0200
Subject: [PATCH 150/174] Give Opera detection a lower priority, because newer
 versions are based on Chromium

---
 scripts/useragents/useragents.lib.php | 188 +++++++++++++-------------
 1 file changed, 95 insertions(+), 93 deletions(-)

diff --git a/scripts/useragents/useragents.lib.php b/scripts/useragents/useragents.lib.php
index 272c26a9..fa032724 100644
--- a/scripts/useragents/useragents.lib.php
+++ b/scripts/useragents/useragents.lib.php
@@ -5733,99 +5733,6 @@ function analyseUserAgent($ua) {
 				}
 			}
 
-			/****************************************************
-			 *		Opera
-			 */
-		
-			if (preg_match('/Opera/i', $ua)) {
-				$this->browser->stock = false;
-				$this->browser->name = 'Opera';
-
-				if (preg_match('/Opera[\/| ]([0-9.]*)/', $ua, $match)) {
-					$this->browser->version = new Version(array('value' => $match[1]));
-				}
-
-				if (preg_match('/Version\/([0-9.]*)/', $ua, $match)) {
-					if (floatval($match[1]) >= 10)
-						$this->browser->version = new Version(array('value' => $match[1]));
-					else
-						$this->browser->version = null;
-				}
-
-				if (is_array($this->browser->version) && preg_match('/Edition Labs/', $ua)) {
-					$this->browser->channel = 'Labs';
-				}
-				
-				if (is_array($this->browser->version) && preg_match('/Edition Next/', $ua)) {
-					$this->browser->channel = 'Next';
-				}
-				
-				if (preg_match('/Opera Tablet/', $ua)) {
-					$this->browser->name = 'Opera Mobile';
-					$this->device->type = TYPE_TABLET;
-				}
-				
-				if (preg_match('/Opera Mobi/', $ua)) {
-					$this->browser->name = 'Opera Mobile';
-					$this->device->type = TYPE_MOBILE;
-				}
-
-				if (preg_match('/Opera Mini;/', $ua)) {
-					$this->browser->name = 'Opera Mini';
-					$this->browser->version = null;
-					$this->browser->mode = 'proxy';
-					$this->device->type = TYPE_MOBILE;
-				}
-				
-				if (preg_match('/Opera Mini\/(?:att\/)?([0-9.]*)/', $ua, $match)) {
-					$this->browser->name = 'Opera Mini';
-					$this->browser->version = new Version(array('value' => $match[1], 'details' => (intval(substr(strrchr($match[1], '.'), 1)) > 99 ? -1 : null)));
-					$this->browser->mode = 'proxy';
-					$this->device->type = TYPE_MOBILE;
-				}
-				
-				if ($this->browser->name == 'Opera' && $this->device->type == TYPE_MOBILE) {
-					$this->browser->name = 'Opera Mobile';
-					
-					if (preg_match('/BER/', $ua)) {
-						$this->browser->name = 'Opera Mini';
-						$this->browser->version = null;
-					}
-				}
-
-				if (preg_match('/InettvBrowser/', $ua)) {
-					$this->device->type = TYPE_TELEVISION;
-				}
-
-				if (preg_match('/Opera[ -]TV/', $ua)) {
-					$this->browser->name = 'Opera';
-					$this->device->type = TYPE_TELEVISION;
-				}
-
-				if (preg_match('/Linux zbov/', $ua)) {
-					$this->browser->name = 'Opera Mobile';
-					$this->browser->mode = 'desktop';
-
-					$this->device->type = TYPE_MOBILE;
-
-					$this->os->name = null;
-					$this->os->version = null;
-				}
-
-				if (preg_match('/Linux zvav/', $ua)) {
-					$this->browser->name = 'Opera Mini';
-					$this->browser->version = null;
-					$this->browser->mode = 'desktop';
-
-					$this->device->type = TYPE_MOBILE;
-
-					$this->os->name = null;
-					$this->os->version = null;
-				}
-				
-				if ($this->device->type == '') {
-					$this->device->type = TYPE_DESKTOP;
-				}
 			}
 
 			/****************************************************
@@ -6045,6 +5952,101 @@ function analyseUserAgent($ua) {
 			}	
 			
 			
+			/****************************************************
+			 *		Opera
+			 */
+		
+			if (preg_match('/Opera/i', $ua)) {
+				$this->browser->stock = false;
+				$this->browser->name = 'Opera';
+
+				if (preg_match('/Opera[\/| ]([0-9.]*)/', $ua, $match)) {
+					$this->browser->version = new Version(array('value' => $match[1]));
+				}
+
+				if (preg_match('/Version\/([0-9.]*)/', $ua, $match)) {
+					if (floatval($match[1]) >= 10)
+						$this->browser->version = new Version(array('value' => $match[1]));
+					else
+						$this->browser->version = null;
+				}
+
+				if (!is_null($this->browser->version) && preg_match('/Edition Labs/', $ua)) {
+					$this->browser->channel = 'Labs';
+				}
+				
+				if (!is_null($this->browser->version) && preg_match('/Edition Next/', $ua)) {
+					$this->browser->channel = 'Next';
+				}
+				
+				if (preg_match('/Opera Tablet/', $ua)) {
+					$this->browser->name = 'Opera Mobile';
+					$this->device->type = TYPE_TABLET;
+				}
+				
+				if (preg_match('/Opera Mobi/', $ua)) {
+					$this->browser->name = 'Opera Mobile';
+					$this->device->type = TYPE_MOBILE;
+				}
+
+				if (preg_match('/Opera Mini;/', $ua)) {
+					$this->browser->name = 'Opera Mini';
+					$this->browser->version = null;
+					$this->browser->mode = 'proxy';
+					$this->device->type = TYPE_MOBILE;
+				}
+				
+				if (preg_match('/Opera Mini\/(?:att\/)?([0-9.]*)/', $ua, $match)) {
+					$this->browser->name = 'Opera Mini';
+					$this->browser->version = new Version(array('value' => $match[1], 'details' => (intval(substr(strrchr($match[1], '.'), 1)) > 99 ? -1 : null)));
+					$this->browser->mode = 'proxy';
+					$this->device->type = TYPE_MOBILE;
+				}
+				
+				if ($this->browser->name == 'Opera' && $this->device->type == TYPE_MOBILE) {
+					$this->browser->name = 'Opera Mobile';
+					
+					if (preg_match('/BER/', $ua)) {
+						$this->browser->name = 'Opera Mini';
+						$this->browser->version = null;
+					}
+				}
+
+				if (preg_match('/InettvBrowser/', $ua)) {
+					$this->device->type = TYPE_TELEVISION;
+				}
+
+				if (preg_match('/Opera[ -]TV/', $ua)) {
+					$this->browser->name = 'Opera';
+					$this->device->type = TYPE_TELEVISION;
+				}
+
+				if (preg_match('/Linux zbov/', $ua)) {
+					$this->browser->name = 'Opera Mobile';
+					$this->browser->mode = 'desktop';
+
+					$this->device->type = TYPE_MOBILE;
+
+					$this->os->name = null;
+					$this->os->version = null;
+				}
+
+				if (preg_match('/Linux zvav/', $ua)) {
+					$this->browser->name = 'Opera Mini';
+					$this->browser->version = null;
+					$this->browser->mode = 'desktop';
+
+					$this->device->type = TYPE_MOBILE;
+
+					$this->os->name = null;
+					$this->os->version = null;
+				}
+				
+				if ($this->device->type == '') {
+					$this->device->type = TYPE_DESKTOP;
+				}
+			}
+
 			/****************************************************
 			 *		wOSBrowser
 			 */

From f1efc799e4143442266f2f797deaed1442450f0c Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 11:59:43 +0200
Subject: [PATCH 151/174] Add Windows "Blue" detection

---
 scripts/useragents/useragents.lib.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/useragents/useragents.lib.php b/scripts/useragents/useragents.lib.php
index fa032724..337f5ef7 100644
--- a/scripts/useragents/useragents.lib.php
+++ b/scripts/useragents/useragents.lib.php
@@ -4001,6 +4001,8 @@ function analyseUserAgent($ua) {
 					$this->os->version = new Version(array('value' => $match[1]));
 					
 					switch($match[1]) {
+						case '6.3':		$this->os->version = new Version(array('value' => $match[1], 'alias' => '"Blue"')); break;
+
 						case '6.2':		if (preg_match('/; ARM;/', $ua))
 											$this->os->version = new Version(array('value' => $match[1], 'alias' => 'RT')); 
 										else

From 16d00825e7c68f2e0a902e25dec935ac9f202d45 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 12:00:07 +0200
Subject: [PATCH 152/174] Add limited BB10 model detection

---
 scripts/useragents/useragents.lib.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/scripts/useragents/useragents.lib.php b/scripts/useragents/useragents.lib.php
index 337f5ef7..ac1fd35f 100644
--- a/scripts/useragents/useragents.lib.php
+++ b/scripts/useragents/useragents.lib.php
@@ -4325,8 +4325,17 @@ function analyseUserAgent($ua) {
 				$this->os->name = 'BlackBerry';
 				$this->os->version = new Version(array('value' => $match[1], 'details' => 2));
 				
-				$this->device->manufacturer = 'RIM';
-				$this->device->model = 'BlackBerry ' . $match[2];
+				$this->device->manufacturer = 'BlackBerry';
+				$this->device->model = $match[2];
+				
+				if ($this->device->model == 'Kbd') {
+					$this->device->model = 'Q10';
+				} 
+				
+				if ($this->device->model == 'Touch') {
+					$this->device->model = 'Z10 or Dev Alpha';
+				} 
+				
 				$this->device->type = preg_match('/Mobile/', $ua) ? TYPE_MOBILE : TYPE_TABLET;
 				$this->device->identified = true;
 

From b943d59d650975471e794755bf16e936f3ec0345 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 12:00:40 +0200
Subject: [PATCH 153/174] Add support for detecting IE11

---
 scripts/useragents/useragents.lib.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/useragents/useragents.lib.php b/scripts/useragents/useragents.lib.php
index ac1fd35f..74f7d9c4 100644
--- a/scripts/useragents/useragents.lib.php
+++ b/scripts/useragents/useragents.lib.php
@@ -5744,6 +5744,9 @@ function analyseUserAgent($ua) {
 				}
 			}
 
+			if (preg_match('/\(IE ([0-9.]*)/', $ua, $match)) {
+				$this->browser->name = 'Internet Explorer';
+				$this->browser->version = new Version(array('value' => $match[1]));
 			}
 
 			/****************************************************

From 12b0a34dc2a797233e5ea5d82f313f9c2a6370d1 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 12:01:05 +0200
Subject: [PATCH 154/174] Add support for detecting the OS/2 port of SeaMonkey

---
 scripts/useragents/useragents.lib.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/scripts/useragents/useragents.lib.php b/scripts/useragents/useragents.lib.php
index 74f7d9c4..b2065231 100644
--- a/scripts/useragents/useragents.lib.php
+++ b/scripts/useragents/useragents.lib.php
@@ -5848,6 +5848,14 @@ function analyseUserAgent($ua) {
 					$this->device->type = TYPE_DESKTOP;
 				}
 			}
+			
+			if (preg_match('/PmWFx\/([0-9ab.]*)/', $ua, $match)) {
+				$this->browser->stock = false;
+				$this->browser->name = 'SeaMonkey';
+				$this->browser->version = new Version(array('value' => $match[1]));
+			}
+			
+			
 
 			/****************************************************
 			 *		Netscape

From 8f725416f1a41f9401bec7d594847588704353d6 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 12:01:22 +0200
Subject: [PATCH 155/174] Add new versions of Chrome

---
 scripts/useragents/useragents.lib.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/useragents/useragents.lib.php b/scripts/useragents/useragents.lib.php
index b2065231..7a53ba80 100644
--- a/scripts/useragents/useragents.lib.php
+++ b/scripts/useragents/useragents.lib.php
@@ -5901,6 +5901,7 @@ function analyseUserAgent($ua) {
 							$this->browser->channel = 'Beta';
 							break;
 						case '18.0.1025':
+						case '25.0.1364':
 							$this->browser->version->details = 1;
 							break;
 						default:	
@@ -5942,6 +5943,8 @@ function analyseUserAgent($ua) {
 						case '22.0.1229':
 						case '23.0.1271':
 						case '24.0.1312':
+						case '25.0.1364':
+						case '26.0.1410':
 							$this->browser->version->details = 1;
 							break;
 						default:	

From b8ef8208407e08fbf7d71c09289fcbec12253a6c Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 12:01:47 +0200
Subject: [PATCH 156/174] Add support for detecting Opera 14

---
 scripts/useragents/useragents.lib.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/scripts/useragents/useragents.lib.php b/scripts/useragents/useragents.lib.php
index 7a53ba80..fc818e68 100644
--- a/scripts/useragents/useragents.lib.php
+++ b/scripts/useragents/useragents.lib.php
@@ -5981,6 +5981,17 @@ function analyseUserAgent($ua) {
 			 *		Opera
 			 */
 		
+			if (preg_match('/OPR\/([0-9.]*)/', $ua, $match)) {
+				$this->browser->stock = false;
+				$this->browser->channel = '';
+				$this->browser->name = 'Opera';
+				$this->browser->version = new Version(array('value' => $match[1], 'details' => 2));
+
+				if ($this->device->type == TYPE_MOBILE) {
+					$this->browser->name = 'Opera Mobile';
+				}
+			}
+
 			if (preg_match('/Opera/i', $ua)) {
 				$this->browser->stock = false;
 				$this->browser->name = 'Opera';

From 6e0b9b0cdaffebd0d0f47bcb43e29659c1922ccc Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 12:02:51 +0200
Subject: [PATCH 157/174] Some versions of UC Browser were initialially
 detected as Chrome and picked up a 'channel'. If we change the browser name,
 we also must drop this 'channel'

---
 scripts/useragents/useragents.lib.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/useragents/useragents.lib.php b/scripts/useragents/useragents.lib.php
index fc818e68..751c454a 100644
--- a/scripts/useragents/useragents.lib.php
+++ b/scripts/useragents/useragents.lib.php
@@ -6385,6 +6385,8 @@ function analyseUserAgent($ua) {
 			if (preg_match('/UCWEB/', $ua)) {
 				$this->browser->stock = false;
 				$this->browser->name = 'UC Browser';
+
+				unset($this->browser->channel);
 				
 				if (preg_match('/UCWEB\/?([0-9]*[.][0-9]*)/', $ua, $match)) {
 					$this->browser->version = new Version(array('value' => $match[1], 'details' => 3));
@@ -6414,6 +6416,8 @@ function analyseUserAgent($ua) {
 			if (preg_match('/ucweb-squid/', $ua)) {
 				$this->browser->stock = false;
 				$this->browser->name = 'UC Browser';
+
+				unset($this->browser->channel);
 			}
 
 			if (preg_match('/\) UC /', $ua)) {
@@ -6439,6 +6443,8 @@ function analyseUserAgent($ua) {
 				$this->browser->name = 'UC Browser';
 				$this->browser->version = new Version(array('value' => $match[1], 'details' => 2));
 
+				unset($this->browser->channel);
+
 				if (!$this->device->type) {
 					$this->device->type = TYPE_MOBILE;
 				}

From 28143ac9c10175f23c91f7f1095c9e5361287273 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 12:03:17 +0200
Subject: [PATCH 158/174] Set the proxy flag for Puffin

---
 scripts/useragents/useragents.lib.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/useragents/useragents.lib.php b/scripts/useragents/useragents.lib.php
index 751c454a..1a2b6c75 100644
--- a/scripts/useragents/useragents.lib.php
+++ b/scripts/useragents/useragents.lib.php
@@ -6541,6 +6541,7 @@ function analyseUserAgent($ua) {
 			if (preg_match('/Puffin\/([0-9.]*)/', $ua, $match)) {
 				$this->browser->name = 'Puffin';
 				$this->browser->version = new Version(array('value' => $match[1], 'details' => 2));
+				$this->browser->mode = 'proxy';
 				$this->browser->channel = '';
 				
 				$this->device->type = TYPE_MOBILE;

From a3adf462dae6fb7e198c9e178cc4223ced917dc3 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 12:03:49 +0200
Subject: [PATCH 159/174] Drop the 'channel' for Maxthon

---
 scripts/useragents/useragents.lib.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/useragents/useragents.lib.php b/scripts/useragents/useragents.lib.php
index 1a2b6c75..ca9fc388 100644
--- a/scripts/useragents/useragents.lib.php
+++ b/scripts/useragents/useragents.lib.php
@@ -6594,6 +6594,7 @@ function analyseUserAgent($ua) {
 			if (preg_match('/Maxthon[\/\' ]([0-9.]*)/', $ua, $match)) {
 				$this->browser->name = 'Maxthon';
 				$this->browser->version = new Version(array('value' => $match[1], 'details' => 2));
+				$this->browser->channel = '';
 				
 				if ($this->os->name == 'Windows' && $this->browser->version->toFloat() < 4) {
 					$this->browser->version->details = 1;

From b985d4ac10f81c819f6e70068ed4c93ea55fb390 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 12:04:23 +0200
Subject: [PATCH 160/174] Make the Maxthon version detection 3 digits accurate

---
 scripts/useragents/useragents.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/useragents/useragents.lib.php b/scripts/useragents/useragents.lib.php
index ca9fc388..1b708f9c 100644
--- a/scripts/useragents/useragents.lib.php
+++ b/scripts/useragents/useragents.lib.php
@@ -6593,7 +6593,7 @@ function analyseUserAgent($ua) {
 		
 			if (preg_match('/Maxthon[\/\' ]([0-9.]*)/', $ua, $match)) {
 				$this->browser->name = 'Maxthon';
-				$this->browser->version = new Version(array('value' => $match[1], 'details' => 2));
+				$this->browser->version = new Version(array('value' => $match[1], 'details' => 3));
 				$this->browser->channel = '';
 				
 				if ($this->os->name == 'Windows' && $this->browser->version->toFloat() < 4) {

From 16ebf08bc31f668f97d46f5491c2545b6071d8b2 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 12:05:01 +0200
Subject: [PATCH 161/174] Add a lot of browser and bots

---
 scripts/useragents/useragents.lib.php | 30 ++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/scripts/useragents/useragents.lib.php b/scripts/useragents/useragents.lib.php
index 1b708f9c..950b8010 100644
--- a/scripts/useragents/useragents.lib.php
+++ b/scripts/useragents/useragents.lib.php
@@ -6624,7 +6624,6 @@ function analyseUserAgent($ua) {
 				array('name' => 'UWebKit',				'regexp' => '/UWebKit\/([0-9.]*)/'),
 				
 				array('name' => 'PhantomJS',			'regexp' => '/PhantomJS\/([0-9.]*)/'),
-				array('name' => 'Google Web Preview',	'regexp' => '/Google Web Preview/'),
 				
 				array('name' => 'Google Earth',			'regexp' => '/Google Earth\/([0-9.]*)/'),
 				array('name' => 'EA Origin',			'regexp' => '/Origin\/([0-9.]*)/'),
@@ -6632,7 +6631,8 @@ function analyseUserAgent($ua) {
 				array('name' => 'Valve Steam',			'regexp' => '/Valve Steam/'),
 				
 				array('name' => 'Songbird',				'regexp' => '/Songbird\/([0-9.]*)/'),
-				array('name' => 'Thunderbird',			'regexp' => '/Thunderbird\/([0-9.]*)/', 'type' => TYPE_DESKTOP),
+				array('name' => 'Thunderbird',			'regexp' => '/Thunderbird[\/ ]([0-9.]*)/', 'type' => TYPE_DESKTOP),
+				array('name' => 'Microsoft Outlook',	'regexp' => '/Microsoft Outlook IMO, Build ([0-9.]*)/', 'details' => 2, 'type' => TYPE_DESKTOP),
 				
 				array('name' => '360 Extreme Explorer',	'regexp' => '/QIHU 360EE/', 'type' => TYPE_DESKTOP),
 				array('name' => '360 Safe Explorer',	'regexp' => '/QIHU 360SE/', 'type' => TYPE_DESKTOP),
@@ -6640,6 +6640,7 @@ function analyseUserAgent($ua) {
 				array('name' => '360 Phone Browser',	'regexp' => '/360 Aphone Browser \(Version ([0-9.]*)\)/'),
 				array('name' => 'ABrowse',				'regexp' => '/A[Bb]rowse ([0-9.]*)/'),
 				array('name' => 'Abrowser',				'regexp' => '/Abrowser\/([0-9.]*)/'),
+				array('name' => 'AltiBrowser',			'regexp' => '/AltiBrowser\/([0-9.]*)/i'),
 				array('name' => 'arora',				'regexp' => '/[Aa]rora\/([0-9.]*)/'),
 				array('name' => 'Avant Browser',		'regexp' => '/Avant TriCore/'),
 				array('name' => 'Baidu Browser',		'regexp' => '/M?BaiduBrowser\/([0-9.]*)/i'),
@@ -6676,10 +6677,12 @@ function analyseUserAgent($ua) {
 				array('name' => 'Jumanji', 				'regexp' => '/jumanji/'),
 				array('name' => 'Kazehakase', 			'regexp' => '/Kazehakase\/([0-9.]*)/'),
 				array('name' => 'KChrome', 				'regexp' => '/KChrome\/([0-9.]*)/', 'details' => 3),
+				array('name' => 'Kiosk', 				'regexp' => '/Kiosk\/([0-9.]*)/'),
 				array('name' => 'K-Meleon', 			'regexp' => '/K-Meleon\/([0-9.]*)/', 'type' => TYPE_DESKTOP),
 				array('name' => 'Leechcraft', 			'regexp' => '/Leechcraft(?:\/([0-9.]*))?/', 'details' => 2),
 				array('name' => 'Lightning', 			'regexp' => '/Lightning\/([0-9.]*)/'),
 				array('name' => 'Lunascape', 			'regexp' => '/Lunascape[\/| ]([0-9.]*)/', 'details' => 3),
+				array('name' => 'Lynx', 				'regexp' => '/Lynx\/([0-9.]*)/'),
 				array('name' => 'iLunascape', 			'regexp' => '/iLunascape\/([0-9.]*)/', 'details' => 3),
 				array('name' => 'Intermec Browser', 	'regexp' => '/Intermec\/([0-9.]*)/', 'details' => 2),
 				array('name' => 'MaCross Mobile', 		'regexp' => '/MaCross\/([0-9.]*)/'),
@@ -6687,12 +6690,12 @@ function analyseUserAgent($ua) {
 				array('name' => 'MixShark', 			'regexp' => '/MixShark\/([0-9.]*)/'),
 				array('name' => 'Motorola WebKit', 		'regexp' => '/MotorolaWebKit(?:\/([0-9.]*))?/', 'details' => 3),
 				array('name' => 'NetFront LifeBrowser', 'regexp' => '/NetFrontLifeBrowser\/([0-9.]*)/'),
+				array('name' => 'NetPositive', 			'regexp' => '/NetPositive\/([0-9.]*)/'),
 				array('name' => 'Netscape Navigator', 	'regexp' => '/Navigator\/([0-9.]*)/', 'details' => 3),
 				array('name' => 'Odyssey', 				'regexp' => '/OWB\/([0-9.]*)/'),
 				array('name' => 'OmniWeb', 				'regexp' => '/OmniWeb/', 'type' => TYPE_DESKTOP),
 				array('name' => 'OneBrowser', 			'regexp' => '/OneBrowser\/([0-9.]*)/'),
 				array('name' => 'Orca', 				'regexp' => '/Orca\/([0-9.]*)/'),
-				array('name' => 'Open Sankoré', 		'regexp' => '/Open-Sankore\/([0-9.]*)/'),
 				array('name' => 'Origyn', 				'regexp' => '/Origyn Web Browser/'),
 				array('name' => 'Palemoon', 			'regexp' => '/Pale[mM]oon\/([0-9.]*)/'),
 				array('name' => 'Phantom', 				'regexp' => '/Phantom\/V([0-9.]*)/'),
@@ -6705,7 +6708,7 @@ function analyseUserAgent($ua) {
 				array('name' => 'QupZilla', 			'regexp' => '/QupZilla\/([0-9.]*)/', 'type' => TYPE_DESKTOP),
 				array('name' => 'Roccat', 				'regexp' => '/Roccat\/([0-9]\.[0-9.]*)/'),
 				array('name' => 'Raven for Mac', 		'regexp' => '/Raven for Mac\/([0-9.]*)/'),
-				array('name' => 'rekonq', 				'regexp' => '/rekonq/', 'type' => TYPE_DESKTOP),
+				array('name' => 'rekonq', 				'regexp' => '/rekonq(?:\/([0-9.]*))?/', 'type' => TYPE_DESKTOP),
 				array('name' => 'RockMelt', 			'regexp' => '/RockMelt\/([0-9.]*)/', 'details' => 2),
 				array('name' => 'Sleipnir', 			'regexp' => '/Sleipnir\/([0-9.]*)/', 'details' => 3),
 				array('name' => 'SMBrowser', 			'regexp' => '/SMBrowser/'),
@@ -6725,10 +6728,27 @@ function analyseUserAgent($ua) {
 				array('name' => 'Wavelink Velocity',	'regexp' => '/Wavelink Velocity Browser\/([0-9.]*)/', 'details' => 2),
 				array('name' => 'WebPositive', 			'regexp' => '/WebPositive/'),
 				array('name' => 'WebRender', 			'regexp' => '/WebRender/'),
+				array('name' => 'Webster', 				'regexp' => '/Webster ([0-9.]*)/'),
 				array('name' => 'Wyzo', 				'regexp' => '/Wyzo\/([0-9.]*)/', 'details' => 3),
 				array('name' => 'Yandex Browser', 		'regexp' => '/YaBrowser\/([0-9.]*)/', 'details' => 2),
+				array('name' => 'YRC Weblink', 			'regexp' => '/YRCWeblink\/([0-9.]*)/'),
 				array('name' => 'Zetakey', 				'regexp' => '/Zetakey Webkit\/([0-9.]*)/'),
-				array('name' => 'Zetakey', 				'regexp' => '/Zetakey\/([0-9.]*)/')
+				array('name' => 'Zetakey', 				'regexp' => '/Zetakey\/([0-9.]*)/'),
+				
+				array('name' => 'McAfee Web Gateway', 	'regexp' => '/Webwasher\/([0-9.]*)/'),
+				
+				array('name' => 'Open Sankoré', 		'regexp' => '/Open-Sankore\/([0-9.]*)/', 'type' => TYPE_WHITEBOARD),
+				array('name' => 'Coship MMCP', 			'regexp' => '/Coship_MMCP_([0-9.]*)/', 'type' => TYPE_SIGNAGE),
+				
+				array('name' => '80legs', 				'regexp' => '/008\/([0-9.]*)/', 'type' => TYPE_BOT),
+				array('name' => 'Ask Jeeves', 			'regexp' => '/Ask Jeeves\/Teoma/', 'type' => TYPE_BOT),
+				array('name' => 'Baiduspider', 			'regexp' => '/Baiduspider\/([0-9.]*)/', 'type' => TYPE_BOT),
+				array('name' => 'Bloglines', 			'regexp' => '/Bloglines\/([0-9.]*)/', 'type' => TYPE_BOT),
+				array('name' => 'Googlebot', 			'regexp' => '/Googlebot\/([0-9.]*)/', 'type' => TYPE_BOT),
+				array('name' => 'Google Web Preview',	'regexp' => '/Google Web Preview/', 'type' => TYPE_BOT),
+				array('name' => 'Google Font Analysis', 'regexp' => '/Google-FontAnalysis\/([0-9.]*)/', 'type' => TYPE_BOT),
+				array('name' => 'HeartRails Capture', 	'regexp' => '/HeartRails_Capture\/([0-9.]*)/', 'type' => TYPE_BOT),
+				array('name' => 'Wget', 				'regexp' => '/Wget\/([0-9.]*)/', 'type' => TYPE_BOT)
 			);
 
 			for ($b = 0; $b < count($browsers); $b++) {

From f05c0f12fa659962f28dab80d4edb33ca9983855 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 12:05:30 +0200
Subject: [PATCH 162/174] Prevent error when browser name is not set

---
 scripts/useragents/useragents.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/useragents/useragents.lib.php b/scripts/useragents/useragents.lib.php
index 950b8010..09be076d 100644
--- a/scripts/useragents/useragents.lib.php
+++ b/scripts/useragents/useragents.lib.php
@@ -6885,7 +6885,7 @@ function analyseUserAgent($ua) {
 			}
 				
 			
-			if ($this->device->type == TYPE_TELEVISION && $this->browser->name == 'Opera') {
+			if (isset($this->browser->name) && $this->browser->name == 'Opera' && $this->device->type == TYPE_TELEVISION) {
 				$this->browser->name = 'Opera Devices';
 				
 				if (preg_match('/Presto\/([0-9]+\.[0-9]+)/', $ua, $match)) {

From 5fe73e6c0a4630f5b3f857c067928cb4713c8b77 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 12:06:02 +0200
Subject: [PATCH 163/174] Fix a bug in NetCast TV detection

---
 scripts/useragents/useragents.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/useragents/useragents.lib.php b/scripts/useragents/useragents.lib.php
index 09be076d..cfb3afc2 100644
--- a/scripts/useragents/useragents.lib.php
+++ b/scripts/useragents/useragents.lib.php
@@ -5197,7 +5197,7 @@ function analyseUserAgent($ua) {
 					}
 
 					if (!isset($this->device->model) && $modelName != '' && $modelName != 'modelName') {
-						switch(modelName) {
+						switch($modelName) {
 							case 'GLOBAL_PLAT3':	$this->device->model = 'NetCast TV'; break;
 							case 'GLOBAL_PLAT4':	$this->device->model = 'NetCast TV'; break;
 							case 'SmartTV2012':		$this->device->model = 'Smart TV 2012'; break;

From 064f8a5300e1749463bdf5afbd73441e14841bc3 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 12:06:26 +0200
Subject: [PATCH 164/174] Prevent an error when there is no match

---
 scripts/useragents/useragents.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/useragents/useragents.lib.php b/scripts/useragents/useragents.lib.php
index cfb3afc2..406e9467 100644
--- a/scripts/useragents/useragents.lib.php
+++ b/scripts/useragents/useragents.lib.php
@@ -6757,7 +6757,7 @@ function analyseUserAgent($ua) {
 					$this->browser->channel = '';
 					$this->browser->stock = false;
 
-					if ($match[1]) {
+					if (isset($match[1]) && $match[1]) {
 						$this->browser->version = new Version(array('value' => $match[1], 'details' => isset($browsers[$b]['details']) ? $browsers[$b]['details'] : null));
 					} else {
 						$this->browser->version = null;

From b35af3edff0f3c8bf6cb7fa115bce68c44a6039a Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 12:06:52 +0200
Subject: [PATCH 165/174] Add support for detecting Netscape Navigator

---
 scripts/useragents/useragents.lib.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/scripts/useragents/useragents.lib.php b/scripts/useragents/useragents.lib.php
index 406e9467..a4236ce9 100644
--- a/scripts/useragents/useragents.lib.php
+++ b/scripts/useragents/useragents.lib.php
@@ -6948,6 +6948,16 @@ function analyseUserAgent($ua) {
 				}
 			}
 			
+			
+			/* If we have a Mozilla browser and not engine or other browser name, it could be the original */
+			if (preg_match('/Mozilla/', $ua) && !isset($this->browser->name) && !isset($this->engine->name)) {
+				$this->browser->name = 'Netscape';
+
+				if (preg_match('/Mozilla\/([0-9.]*)/i', $ua, $match)) {
+					$this->browser->version = new Version(array('value' => $match[1]));
+				}
+			}
+			
 		}
 		
 		function toJavaScript() {

From aed098d7c9912f93636e4acd63e6245154c86e98 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 12:07:46 +0200
Subject: [PATCH 166/174] Add support for detecting IRIX

---
 scripts/useragents/useragents.lib.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/scripts/useragents/useragents.lib.php b/scripts/useragents/useragents.lib.php
index a4236ce9..2e6d3efb 100644
--- a/scripts/useragents/useragents.lib.php
+++ b/scripts/useragents/useragents.lib.php
@@ -3793,6 +3793,23 @@ function analyseUserAgent($ua) {
 			}
 			
 			
+			/****************************************************
+			 *		IRIX
+			 */
+		
+			if (preg_match('/IRIX/', $ua)) {
+				$this->os->name = 'IRIX';
+
+				if (preg_match('/IRIX ([0-9.]*)/', $ua, $match)) {
+					$this->os->version = new Version(array('value' => $match[1]));
+				}
+
+				if (preg_match('/IRIX;(?:64|32) ([0-9.]*)/', $ua, $match)) {
+					$this->os->version = new Version(array('value' => $match[1]));
+				}
+			}
+			
+			
 			/****************************************************
 			 *		Syllable
 			 */

From 45e051ab192ae638a6089864022b64fa5a9c8432 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 12:22:02 +0200
Subject: [PATCH 167/174] Fix typo (thanks leematos)

---
 about.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/about.html b/about.html
index e7e5f4a4..09e670b9 100644
--- a/about.html
+++ b/about.html
@@ -174,7 +174,7 @@ <h3>What happens when a browser cheats?</h3>
 						<p>
 							We cannot distinguish between a browser that supports a particular feature and a browser that lies about supporting
 							that feature. The only way do deal with these situations it to manually confirm the test results. And if a browser
-							is found to be overly confidant about claiming support for certain features we can put that browser on a blacklist. 
+							is found to be overly confident about claiming support for certain features we can put that browser on a blacklist. 
 							That means that that even though the browser claims to support a particular feature, we ignore what the browser says and do
 							not give any points. This is usually just a temporary problem and once the browser has been fixed we will remove
 							the new version from the blacklist.

From c8e4b8f40899753bfa4a4175715e7120c871dce7 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 21:21:56 +0200
Subject: [PATCH 168/174] Add default text color

---
 css/main.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/css/main.css b/css/main.css
index 55920520..68b7c67a 100644
--- a/css/main.css
+++ b/css/main.css
@@ -352,6 +352,7 @@ body {
 	top: 32px;
 	
 	background: #fff;
+	color: #000;
 
 	-webkit-border-radius: 6px;
 	-webkit-border-top-left-radius: 0;
@@ -737,6 +738,7 @@ body {
 	background: #f0f0f0 -ms-linear-gradient(top, #e6e6e6, #f6f6f6 43px, #d6d6d6 43px, #f0f0f0);
 	background: #f0f0f0 -o-linear-gradient(top, #e6e6e6, #f6f6f6 43px, #d6d6d6 43px, #f0f0f0);
 	background: #f0f0f0 linear-gradient(top, #e6e6e6, #f6f6f6 43px, #d6d6d6 43px, #f0f0f0);
+	color: #000;
 }
 .resultsTable table thead th {
 	padding: 0px 10px;

From 17a61b699f849f4621f6218a346eb59712efb28b Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 21:22:26 +0200
Subject: [PATCH 169/174] Use proper viewport syntax

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 3d55486a..53184130 100644
--- a/index.html
+++ b/index.html
@@ -8,7 +8,7 @@
 		
 		<meta name="apple-mobile-web-app-capable" content="yes">
 		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<meta name="viewport" content="width=device-width; initial-scale=1.0">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		
 		<link href='//fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css'>
 		<link href='//fonts.googleapis.com/css?family=Alfa+Slab+One' rel='stylesheet' type='text/css'>

From 98315e6ed152d4ab0bdfd3fdc3f02b9a705edf42 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 21:22:58 +0200
Subject: [PATCH 170/174] Add a Windows 8 tile image and color

---
 images/tile.png | Bin 0 -> 3364 bytes
 index.html      |   4 ++++
 2 files changed, 4 insertions(+)
 create mode 100644 images/tile.png

diff --git a/images/tile.png b/images/tile.png
new file mode 100644
index 0000000000000000000000000000000000000000..715e1b64b698bdb96d1c2a3eaae45fabf57bb742
GIT binary patch
literal 3364
zcmbtXX*|^Z7XQzfVaAXN4OxdGMz*qL9lOb3Lb3}fMN%S5dd47I(;#cMiKLQsh$zPL
zWGVYz)+l42jHP6`o_p`x`|7?p=X<`tvwlA3&F{n!EKRvNg*X8K;KrF5Ss!BJKLTSv
z)bl3aY7YSvU~Osuly-|O91_SieG7d6sGuNr-JypZ?P+Fh0RW-W06>fafSto9A_D*d
zl>lJzG5~010DyphcHISS0N~2U8R^>wyRPKG6J3mtJxoe8#t|VNVE9S1a;{GRt|B8!
zo<M39lm|aYLuAZS?#QMZ8&%PvATRkbeHo?8_FP&QGvX`F2u~u=S-ujITB^@rNSNmA
zwmIdN^yj&W2Wt%@+d+A+c9t6EHdl1#*A4==SH6aa<^(SH2r98Z0(sK^e`v*;nwsWq
zZEZ<7#~iP`J^gDj>pcni2vWrs<;>>DovC5}?bnw+$Y5We_?fFjfuqTLURQvITu7Ld
zBHBz4)&NcOnp60F#eY+ri8R8ifU0YFNRQTt0?C(5Ou%@o%L6t4w-Qm=-Y)hgn~9$x
zgT~lIWf5n%-PIzcl@w{}Dp&|Ep&r50pJp7iW`Ui6s(=mrAjLGBjG*&;gnJ<J!^G(8
z=FL4}|B!H$LGI52rIkTxDh1&k@+FzcnuH9xU}q&-A#=|p_!9Y$*(HeMHcg+zcBS$L
zA#)JO(LFkz>A3!yiKatrkM;t=TFr-{Vp(yeTtsBI^fU*xi_%<W<Akt1&PFCZVlAsa
zoZ@MQ*e*1y#L0j@teCogd1Zk;1|mm1`b5|I?<B_9dV`N2rVaHt2P|)bU&Fk4ubj4Y
zI<h~RMI1&Z!hRMhPiWx}lfpq~_A^WQZ?MMy=^Zh=^DChpVw=hFbk!<v!X5m&3Tv7v
zvU^+!6ke6%Ak1mCUevRSWb@yKjp~eryKCqP?w(8$kqN7wY>K!<_mOHT9t~3;mGS~D
z7%wh>pc{&vjimL)p3OF?=2zXr1r_0}6sQUcT*@hdR)0t!k`yB(upSDChn;r8Utw?3
zD~Umou}%iCcCy6&`QKWnoIqapvOAv;f5ae>-yZ;e99pS4ZC6%`)}<r$AiTZjI~$0V
zHTbvS&Q*<L8VGG+0(RbJpHa!mc(Z3asf;!w$aaPcXQyu1;Kx!;zjwXhjr5&=Hm=@O
zQ{mq7pD3ya80rvb_U@^MHvfkCzbmEQGl~6435!Z69$_6tZf`=DBDrg=0+h2r#;65&
zR$Yitp(tUi4)c7^kBisHuyiTgWG0V6776Fr@vgMA@)>7&DRGGKr~r*e#_9K1b)*BE
zHz$m<_auJh@+}6FYp{QnE67~QN%<&q6kZ{~et{?2dh1T_tO)X;Ec3dB@_o^4gdaPi
z$(s45zJ|PnVLssL)p~oc$y}i%|CKHbrQyC8yCiWrtKZhXk1JYR^&o(alL74%AL~Hm
zRcl@0B$QjN@Frc(1-&!1IMJhyl_Qu3Vnp!sHwNIklF{WQP2|J9K)fg|4_D|((;m!p
z6WEKVl$75Zg!JHYTH8nbP%GrZSJLmH_M5HSDaC@HD5L?pJa(e1QTT%0u=Yh=?|?0t
z(N;5Z>g%5wbK64M28pPFsr1z8_XFqpycHOG?^&g%^v2k#KF>L>kDbLu*akQ@o`&_K
zE33sSJsSl4CfO2*KRR_?$OF$C?twL79%-$oN!s@#Pn4u-^W9gFO?uPi5IZy;@9L?Y
z%F$6VKT}uz>D}9m*vo(<e=45VE9X(R`+hf4vBa&8-`6zv`cgZb;aiI8|J%@=xryo(
z8G4J8YloXDM@+J&dy*ft(m8|cA-<_^V*OojADzF=t+{ROVf=dO0J_VKvo_K=z-8AI
za4!;+b{BNM;wu?>*|Gki;d}(q#oIN_Gi>+qYpn(%Q_bhx^b+9nKuqY;Uz($*Gwot`
zhJCoAt7#4lkyajxqwAgE8{jX9qVym1JTDNNe~6A?QtK|#vNVR~2BA2t%(no}x)zqS
zCrD)XV(hJw4W~4o@U(;%hV-G(I&y<tO9!{VUGY9?nIqw%AM>3cp59nHf}EiSsVzIq
zDSXzMklBAcj3~iGGRj$A{@}MC8+*DePVQSDvrXx2LX}wG=laZ1X|d#ARs4;M=|nXX
ziw@tE{7PS&IZF=K*U&<ZQ{xfxlD@ra*Np!>eTM5+Z9D2W-B?E3F6rIcveVtt;rM8(
zcO*G7)C15wwJiQj4kG-6gj!~7Rs&O;5?zn6if0gGyzZBTGpg0}@_7Xw`#owYisnat
zuOYF~c+DNV+;s%{e^ggtzlivw1e1pH`iok|Zqh~3?e20Ze*(&Jc9OVaI<;}Q?1Q%?
zZ_KnpqUE5fdIKTbz~Z6mW{>J`w+@Wh$mR{nyLyE7I085PN*=|k(5e^(WJiYDso3b3
z{&_lQj#j&ow;S12rRw7_TKFoaY-h)IXG3EGjJhI)q1@#KWlWpr<_^}bZE5?qYw;}i
zzuCaM<(<zHldQh9>`#pq5aN>se%$14&Y3GF!ZnxgRVjvyeo6nM0ABkcPt;y-DZRC`
z!*3iaBF+_|<)70UnC}?F?tX85BKi!!UtyVI$at}fR3li9^^*CXMOT1I9;B4Hr8VHV
zYEfnqj;>wx>#X*kxUWGpH5||6-?giDGe5;T3YuBnZ1o$Mt1oLjgA4-%{lS>!VP8H%
zz+FOstR?pB%a<`MKb`gV9*AwgklMV-p(l8?njeGJmkaFwtn@%$!m|DN`7vQ1T~iNc
zVGG=>ua)ziGI|jOTR-OPuA+hRHjfuOmqpI2J4fBCXbS_`rR(37P-kydKwAh}g8u?@
zsvZCKoIWDE9l|`@1s&=IFNBZ6sflf=MQF5qH>Oz=EicK^U5yJ<NqRX<^S?Ex3TrD3
zP}OGcxu-~e@Y&z~*fHIurzV5(kyo_Y#28kDa=vpFs<&j1JTC!rJCPuXh7AjO=Y%>Z
z5I4?jc592h6HelI+qGVj-v3-Np6F~d#Xe>e-Z7h7LeDp`eefZqPTb`EtyzRLy4s+K
z*yLawwWpb{PwTaC1JaG1M+;|ZFT6I3?k>ciM2~RFM{RueA(_?7_UdDzxq4z;cp^Ir
z`AqC05i;n%MF%4=7X|X4Tm^cc7Ut_V$c-mhHi@NI>z+?9^#<Q5Nqia}{YbbV&X}sy
zn&U*dJNKlnWCm-B^xns`vlDN)2nKy%t2$b_NO^X*c|oN%7JNt2+Wh(IveEtro=c**
z{SaLr_pJQI19nDK-p~-{%=9)V{anoYEO#Zr78Gcwd5kG(4;H)A>zrgcAUn6%QtA=t
zvSd`9+qZwr1q*Vb)WzG?aIQ){kuNw#5jhJQDtzL4%S8L;v<PzB+K!LV0@>jI*0*ar
z9y63l6q2TfwTIXa&WbNJ3!M<VGc=Hn>fcTX-Sq_Dcy#y=V7p9VIEnKS_Q3`k@%R@7
zv>l_VoeZLoBzk3SN)P_?KW3uEHDQ`g^!F2zMg=k=+mRE=*TdgHJ59Aap)(9`W(zjk
z{8HGTi}ncH##kh|+v;L@&&HAL!_iKm16}5rrlphhxO~PU9=i#Ttv`4ed;~?g0BatB
z^AT1K`&zNBFhm)j!c-P=h|-1z%y9SWOJ1zCD8-d&9oe0lm7$a)o0=5_VMOE_{$>N$
z4Y{MGY4u}Q*KUpuEf%Cq8P00Je$#TLZxpEH)H~M%I<L!HT`IKM`!e>*&MX3xUU-5-
z&uW6Q{PLvu2u+2Iq(L=!z4L~q_84S!RcG&ef3ML&=$sLL2crQSA+s++jFimc+P5Tw
z+=m0+9p7qPtxiL)k<uK0<F|B2sx6}57e@ryHzYS}z{RW4uBVPH(rXu-XWaycWl{~P
zBz4(k7eodde}!wrOQSo?mW6fS=s6yHD2i0j5tb5n%G68$2fAD*1ALcI_Bi*xZqIqH
zRDlQHuGbX4_x#XwExGl0(812<4At$0Pb&Yk6DWm$8rSG7%CeuE$Uhj730mZ?^BoTH
zY-<-UUchn@<l-w|%ePMf^N~&w!|ZyTRnT(`OY6=NqJ4#69%S2dNxQV|)75Fw(X+^|
zp9001H>oUqU^2B^C+Fj4{WPaPPw!=CQor(~kok3<-SbpaFJs!TsoK{p#}ad!I)!a-
z=NGCSnpHJj-^)t+tbiPq=Nj>jG}?zcnK7Zi$SLE77~D?;$8Aw|wRzSx+X!sdY6CmJ
z^)Il$a&LuI0&%O+=jKljYDHWc{{C`Lc+m#wF~|*2QLqWlcrp=ul}DEXI?;qgZkseF
zFG<mUm!=AtMIV``S&G<Z)aB42`x7BmDa|}qGgAX$qz0Q%j>3uKj{>c%I9>hNW<INW
iz{&sP4xn~$?F#79!O!=5JpVak0GzR<QK`XY(!T&Pmnp&k

literal 0
HcmV?d00001

diff --git a/index.html b/index.html
index 53184130..72395bd4 100644
--- a/index.html
+++ b/index.html
@@ -26,6 +26,10 @@
 		<link rel="icon" href="/images/icon.png">
 		<link rel="apple-touch-icon" href="/images/button.png">
 		
+		<meta name="application-name" content="HTML5test"/> 
+		<meta name="msapplication-TileColor" content="#454545"/> 
+		<meta name="msapplication-TileImage" content="http://html5test.com/images/tile.png"/>
+
 		<meta property="og:title" content="The HTML5 test - How well does your browser support HTML5?" />
 		<meta property="og:description" content="The HTML5 test score is an indication of how well your browser supports the upcoming HTML5 standard and related specifications. How well does your browser support HTML5?" />
 		<meta property="og:type" content="website" />

From a82196ad3506ff26edd8e7e26732cedd1acab5a3 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 21:23:19 +0200
Subject: [PATCH 171/174] Make tokenizer test compatible with DOM4

---
 scripts/engine.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/engine.js b/scripts/engine.js
index 9233c433..b03b218c 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -525,13 +525,13 @@ Test = (function() {
 				result &= e.firstChild && e.firstChild.nodeName == "DIV<DIV";
 	
 				e.innerHTML = "<div foo<bar=''>";
-				result &= e.firstChild.attributes[0].nodeName == "foo<bar";
+				result &= e.firstChild.attributes[0].nodeName == "foo<bar" || e.firstChild.attributes[0].name == "foo<bar";
 				
 				e.innerHTML = "<div foo=`bar`>";
 				result &= e.firstChild.getAttribute("foo") == "`bar`";
 				
 				e.innerHTML = "<div \"foo=''>";
-				result &= e.firstChild && e.firstChild.attributes[0].nodeName == "\"foo";
+				result &= e.firstChild && (e.firstChild.attributes[0].nodeName == "\"foo" || e.firstChild.attributes[0].name == "\"foo");
 				
 				e.innerHTML = "<a href='\nbar'></a>";
 				result &= e.firstChild && e.firstChild.getAttribute("href") == "\nbar";

From 001c5e4b8f711435e97b64f260716233a4a44065 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 21:23:31 +0200
Subject: [PATCH 172/174] Add geolocation blacklist

---
 scripts/engine.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/engine.js b/scripts/engine.js
index b03b218c..ded7ecdb 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -2536,7 +2536,7 @@ Test = (function() {
 			
 			this.section.setItem({
 				id:			'geolocation',
-				passed:		!!navigator.geolocation, 
+				passed:		!blacklists.geolocation && !!navigator.geolocation, 
 				value: 		15
 			});
 

From 3a42b17aac5928513b2339f5039eb7b08691ad81 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 21:23:45 +0200
Subject: [PATCH 173/174] Add device orientation blacklist

---
 scripts/engine.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/engine.js b/scripts/engine.js
index ded7ecdb..11f6f182 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -2542,7 +2542,7 @@ Test = (function() {
 
 			this.section.setItem({
 				id:			'orientation',
-				passed:		!!window.DeviceOrientationEvent, 
+				passed:		!blacklists.orientation && !!window.DeviceOrientationEvent, 
 				value: 		5
 			});
 		}

From fcfa9e7068c822cc9bd6985d252f8da0472fbc36 Mon Sep 17 00:00:00 2001
From: Niels Leenheer <niels@leenheer.nl>
Date: Wed, 3 Apr 2013 21:24:22 +0200
Subject: [PATCH 174/174] =?UTF-8?q?Add=20Baidu=20Browser=20to=20a=20whole?=
 =?UTF-8?q?=20bunch=20of=20blacklists=E2=80=A6=20Shame=20on=20you!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/engine.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/scripts/engine.js b/scripts/engine.js
index 11f6f182..1e0d893a 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -18,14 +18,16 @@ Test = (function() {
 				colorField:			Browsers.isBrowser('Sogou Explorer') || Browsers.isBrowser('UC Browser'),
 				rangeField:			Browsers.isBrowser('UC Browser'),
 				numberField:		false,
-				progressField:		false,
+				progressField:		Browsers.isBrowser('Baidu Browser'),
 				meterField:			false,
 				fileSystem:			Browsers.isOs('BlackBerry Tablet OS'),
-				subtitle:			Browsers.isBrowser('Sogou Explorer'),
-				notifications:		Browsers.isBrowser('Sogou Explorer'),
+				subtitle:			Browsers.isBrowser('Baidu Browser') || Browsers.isBrowser('Sogou Explorer'),
+				notifications:		Browsers.isBrowser('Baidu Browser') || Browsers.isBrowser('Sogou Explorer'),
 				fullScreen:			Browsers.isBrowser('Sogou Explorer') || Browsers.isOs('BlackBerry Tablet OS') || Browsers.isOs('BlackBerry OS'),
-				getUserMedia:		Browsers.isBrowser('Sogou Explorer') || Browsers.isBrowser('UC Browser') || Browsers.isBrowser('Dolphin'),
-				webgl:				false
+				getUserMedia:		Browsers.isBrowser('Baidu Browser') || Browsers.isBrowser('Sogou Explorer') || Browsers.isBrowser('UC Browser') || Browsers.isBrowser('Dolphin'),
+				webgl:				Browsers.isBrowser('Baidu Browser'),
+				geolocation:		Browsers.isBrowser('Baidu Browser'),
+				orientation:		Browsers.isBrowser('Baidu Browser')				
 			};		
 			
 			whitelists = {