Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	dist/vis.js
	dist/vis.map
	dist/vis.min.js
	download/vis.zip
	index.html

blog.html

@@ -211,6 +211,7 @@
     <div class="postsMenu">
         <div class="postsMenuContent">
             Posts:
+            <a data-scroll class="post" href="#CrownstoneKickstarter">- The Crownstone kickstarter promotion</a>
             <a data-scroll class="post" href="#V4Release">- V4, ES6 and what's next</a>
             <a data-scroll class="post" href="#Released version 3.11.0">- Released version 3.11.0</a>
             <a data-scroll class="post" href="#Released version 3.10.0">- Released version 3.10.0</a>
@@ -222,6 +223,36 @@
         </div>
     </div>
 
+
+    <div class="post">
+        <div class="postHeader" id="CrownstoneKickstarter">The Crownstone kickstarter promotion</div>
+        <div class="postAuthor">by <a href="https://github.com/alexdm0">Alex</a></div>
+        <div class="postDate">15th of September 2015</div>
+        <div class="postContent">
+            <p>
+           Hi Everyone,
+            </p>
+            <p>
+            So you may have noticed the big banner on our website and thought: "What the hell?". I'd like to explain why we're doing this. </p><p>
+            As you may know, vis.js is developed at Almende BV in the Netherlands. Almende has a number of daughter companies, among which: <a href="http://dobots.nl" target="_blank">DoBots</a>.
+                They share our building and we're working with them a lot! We have used their code and hardware in projects and have contributed some code for the
+                firmware as well.
+            </p>
+            <img src="./images/blog/kickstarter_1.png" style="position:relative; left:12px; padding:10px;">
+            <p><a href="https://www.kickstarter.com/projects/dobots/crownstone">DoBots is now doing a kickstarter for the Crownstone, a smart upgrade for any power socket!</a> Recently I have spend a few weeks helping them settings up their campaign. I made the video's,
+                the 3D artwork and helped out with the texts. I think this is a great product and I believe it deserves a chance to enter the market!</p>
+            <img src="./images/blog/kickstarter_2.png" style="position:relative; left:12px; padding:10px;">
+            <p>Like us (the vis.js team), the guys at DoBots believe in open source. The Crownstone's Bluetooth API's will be open but secure so only YOU can use YOUR Crownstones. This means you can use any BLE device to interact with your house!
+            If the stretchgoal is made, there'll even be Arduino support! I will also be working on the iOS app and that too will be open source.</p>
+            <p>I hope our community can help <a href="https://www.kickstarter.com/projects/dobots/crownstone">the kickstarter</a> reach it's goal and maybe even the stretchgoals.</p>
+            <img src="./images/blog/kickstarter_3.png" style="position:relative; left:12px; padding:10px;">
+            <p><a href="https://www.kickstarter.com/projects/dobots/crownstone">Please support us and spread the word!</a></p><p>If you share it in a tweet, facebook or different way, <a href="https://github.com/almende/vis/issues/1302">leave a comment in issue #1302! :)</a></p>
+            <p>Regards and thank you,</p>
+            <p>Alex</p>
+
+        </div>
+    </div>
+
     <div class="post">
         <div class="postHeader" id="V4Release">V4, ES6 and what's next</div>
         <div class="postAuthor">by <a href="https://github.com/alexdm0">Alex</a></div>

css/style.css

@@ -35,6 +35,13 @@ div.wall {
     margin-top:5px;
 }
 
+div.wallKickstarter {
+    background-image: url("../images/wallKickstarter.png");
+    background-repeat: no-repeat;
+    background-size:cover;
+    margin-top:5px;
+}
+
 div.trans {
     background-color: rgba(0,0,0,0);
 }

index.html

@@ -42,6 +42,16 @@
             }
         }
     </script>
+
+    <style>
+        a.kickstarter {
+            color: #fff3ca;
+        }
+        p.kickstarter {
+            color:#ffffff;
+        }
+    </style>
+
 </head>
 <!-- NAVBAR
 ================================================== -->
@@ -80,14 +90,19 @@
 
 <!-- Carousel
 ================================================== -->
-<div class="jumbotron wall hidden-xs">
+<div class="jumbotron wallKickstarter hidden-xs">
     <div class="jumbotron trans">
         <div class="container jumbo">
             <h1>vis.js</h1>
-            <p>A dynamic, browser based visualization library.
-            The library is designed to be easy to use, to handle large amounts
-            of dynamic data, and to enable manipulation of and interaction with the data.
-            The library consists of the components DataSet, Timeline, Network, Graph2d and Graph3d. <a href="#download_install" class="header">Get it over here!</a></p>
+            <p class="kickstarter">Our colleagues at <a href="https://dobots.nl/" class="kickstarter">DoBots</a> are currently doing a kickstarter for <br>
+                the <a class="kickstarter" href="https://www.kickstarter.com/projects/dobots/crownstone"> Crownstone: the smart power outlet that recognizes you and your devices!</a>
+            We have helped them with their campaign preperations and code. Please take a look and support them! <br>
+                <a href="./blog.html" class="kickstarter">More information on why this is on vis.js here</a>
+            </p>
+            <!--<p>A dynamic, browser based visualization library.-->
+            <!--The library is designed to be easy to use, to handle large amounts-->
+            <!--of dynamic data, and to enable manipulation of and interaction with the data.-->
+            <!--The library consists of the components DataSet, Timeline, Network, Graph2d and Graph3d. <a href="#download_install" class="header">Get it over here!</a></p>-->
         </div>
     </div>
     <!--<div class="container">-->