diff --git a/dao/src/main/resources/demo-data.cql b/dao/src/main/resources/demo-data.cql
index 68154cc89a..e879274a07 100644
--- a/dao/src/main/resources/demo-data.cql
+++ b/dao/src/main/resources/demo-data.cql
@@ -194,6 +194,17 @@ VALUES (
 	'test device c1'
 );
 
+INSERT INTO thingsboard.device ( id, tenant_id, customer_id, name, search_text, additional_info)
+VALUES (
+	c8f1a6f0-b993-11e6-8a04-9ff4e1b7933c,
+	minTimeuuid ( '2016-11-01 01:02:01+0000' ),
+	minTimeuuid ( 0 ),
+	'DHT11 Demo Device',
+	'dht11 demo device',
+	'{"description":"Demo device that is used in sample applications that upload data from DHT11 temperature and humidity sensor"}'
+);
+
+
 INSERT INTO thingsboard.device_credentials ( id, device_id, credentials_type, credentials_id)
 VALUES (
 	now(),
@@ -234,6 +245,14 @@ VALUES (
 	'C1_TEST_TOKEN'
 );
 
+INSERT INTO thingsboard.device_credentials ( id, device_id, credentials_type, credentials_id)
+VALUES (
+	now(),
+	c8f1a6f0-b993-11e6-8a04-9ff4e1b7933c,
+	'ACCESS_TOKEN',
+	'DHT11_DEMO_TOKEN'
+);
+
 /** Demo data **/
 
 /** Demo plugins & rules **/
@@ -399,4 +418,16 @@ VALUES (
 	'[{"configuration":{"messageTypes":["RPC_REQUEST"]},"name":"RPC Request Filter","clazz":"org.thingsboard.server.extensions.core.filter.MsgTypeFilter"},{"configuration":{"methodNames":[{"name":"getDevices"},{"name":"sendMsg"}]},"name":"Messaging methods filter","clazz":"org.thingsboard.server.extensions.core.filter.MethodNameFilter"}]',
 	null,
 	'{"configuration":{},"clazz":"org.thingsboard.server.extensions.core.action.rpc.RpcPluginAction","name":"Messaging RPC Action"}'
+);
+
+/** Demo dashboards **/
+
+INSERT INTO thingsboard.dashboard ( id, tenant_id, customer_id, configuration, title, search_text)
+VALUES (
+	now(),
+	minTimeuuid ( '2016-11-01 01:02:01+0000' ),
+	minTimeuuid ( 0 ),
+	'{"description":"Demo dashboard for sample applications that upload temperature and humidity received from DHT11 or DHT22 sensors","widgets":[{"isSystemType":true,"bundleAlias":"digital_gauges","typeAlias":"digital_thermometer","type":"latest","title":"New widget","sizeX":5,"sizeY":5,"config":{"datasources":[{"type":"device","dataKeys":[{"name":"temperature","type":"timeseries","label":"temperature","color":"#2196f3","settings":{},"_hash":0.3720839051412099}],"deviceAliasId":1,"name":"DHT11"}],"timewindow":{"realtime":{"timewindowMs":60000}},"showTitle":false,"backgroundColor":"#000000","color":"rgba(0, 0, 0, 0.87)","padding":"0px","settings":{"maxValue":50,"donutStartAngle":90,"showValue":true,"showMinMax":true,"gaugeWidthScale":1,"levelColors":["#304ffe","#7e57c2","#ff4081","#d32f2f"],"refreshAnimationType":"<>","refreshAnimationTime":700,"startAnimationType":"<>","startAnimationTime":700,"titleFont":{"family":"RobotoDraft","size":12,"style":"normal","weight":"500"},"labelFont":{"family":"RobotoDraft","size":8,"style":"normal","weight":"500"},"valueFont":{"family":"Segment7Standard","style":"normal","weight":"500","size":18},"minMaxFont":{"family":"Segment7Standard","size":12,"style":"normal","weight":"500"},"dashThickness":1.5,"decimals":0,"minValue":0,"units":"°C","gaugeColor":"#333333","neonGlowBrightness":35,"gaugeType":"donut","showTitle":false},"title":"Temperature"},"row":0,"col":0},{"isSystemType":true,"bundleAlias":"digital_gauges","typeAlias":"digital_vertical_bar","type":"latest","title":"New widget","sizeX":3,"sizeY":5,"config":{"datasources":[{"type":"device","dataKeys":[{"name":"humidity","type":"timeseries","label":"humidity","color":"#2196f3","settings":{},"_hash":0.9492802776509441}],"deviceAliasId":"1","name":"DHT11"}],"timewindow":{"realtime":{"timewindowMs":60000}},"showTitle":false,"backgroundColor":"#000000","color":"rgba(0, 0, 0, 0.87)","padding":"0px","settings":{"maxValue":100,"donutStartAngle":90,"showValue":true,"showMinMax":true,"gaugeWidthScale":0.75,"levelColors":["#3d5afe","#f44336"],"refreshAnimationType":"<>","refreshAnimationTime":700,"startAnimationType":"<>","startAnimationTime":700,"titleFont":{"family":"RobotoDraft","size":12,"style":"normal","weight":"500"},"labelFont":{"family":"RobotoDraft","size":8,"style":"normal","weight":"500"},"valueFont":{"family":"Segment7Standard","style":"normal","weight":"500","size":14},"minMaxFont":{"family":"Segment7Standard","size":8,"style":"normal","weight":"normal","color":"#cccccc"},"neonGlowBrightness":20,"decimals":0,"showUnitTitle":true,"gaugeColor":"#171a1c","gaugeType":"verticalBar","showTitle":false,"minValue":0,"dashThickness":1.2},"title":"Humidity"},"row":0,"col":5}],"deviceAliases":{"1":{"alias":"DHT11","deviceId":"c8f1a6f0-b993-11e6-8a04-9ff4e1b7933c"}}}',
+    'Temperature & Humidity Demo Dashboard',
+	'temperature & humidity demo dashboard'
 );
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index bb5dab2a1a..488de00932 100755
--- a/pom.xml
+++ b/pom.xml
@@ -19,12 +19,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.thingsboard</groupId>
-    <artifactId>server</artifactId>
+    <artifactId>thingsboard</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <name>Thingsboard Server Components</name>
-    <url>http://thingsboard.org</url>
+    <name>Thingsboard</name>
+    <url>http://thingsboard.io</url>
     <inceptionYear>2016</inceptionYear>
 
     <properties>
diff --git a/ui/package.json b/ui/package.json
index b8a0775417..d982261b18 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -62,11 +62,11 @@
     "oclazyload": "^1.0.9",
     "raphael": "^2.2.7",
     "rc-select": "^6.6.1",
-    "react": "^15.3.2",
-    "react-ace": "^3.7.0",
-    "react-dom": "^15.3.2",
-    "react-schema-form": "^0.2.10",
-    "react-tap-event-plugin": "^1.0.0",
+    "react": "^15.4.1",
+    "react-ace": "^4.1.0",
+    "react-dom": "^15.4.1",
+    "react-schema-form": "^0.3.1",
+    "react-tap-event-plugin": "^2.0.1",
     "reactcss": "^1.0.9",
     "sass-material-colors": "0.0.5",
     "schema-inspector": "^1.6.6",