diff --git a/content/dev-setup.html b/content/dev-setup.html
index 4201441..2ff706d 100644
--- a/content/dev-setup.html
+++ b/content/dev-setup.html
@@ -82,6 +82,11 @@
 
 <ul id="markdown-toc">
   <li><a href="#introduction" id="markdown-toc-introduction">Introduction</a></li>
+  <li><a href="#master-snapshots" id="markdown-toc-master-snapshots">Master snapshots</a>    <ul>
+      <li><a href="#managix-installer" id="markdown-toc-managix-installer">Managix Installer</a></li>
+      <li><a href="#yarn-installer" id="markdown-toc-yarn-installer">YARN Installer</a></li>
+    </ul>
+  </li>
   <li><a href="#setting-up-an-asterix-development-environment-in-eclipse" id="markdown-toc-setting-up-an-asterix-development-environment-in-eclipse">Setting up an Asterix Development environment in Eclipse</a>    <ul>
       <li><a href="#prerequisites" id="markdown-toc-prerequisites">Prerequisites</a></li>
       <li><a href="#steps" id="markdown-toc-steps">Steps</a></li>
@@ -110,6 +115,17 @@
 
 <hr />
 
+<h2 id="master-snapshots">Master snapshots</h2>
+<p>If you are a developer simply looking for a snapshot of the latest development version of AsterixDB to test out your application that is based on top of AsterixDB, snapshots from the latest successful push to our master branch are available below. These are non ASF-release, automatic builds.</p>
+
+<h3 id="managix-installer">Managix Installer</h3>
+<p><a class="btn btn-md btn-warning" href="https://asterix-jenkins.ics.uci.edu/job/asterix-test-full/lastStableBuild/org.apache.asterix$asterix-installer/artifact/org.apache.asterix/asterix-installer/0.8.7-SNAPSHOT/asterix-installer-0.8.7-SNAPSHOT-binary-assembly.zip" role="button">Download AsterixDB 0.8.7-SNAPSHOT <i class="fa fa-download fa-lg"></i> </a></p>
+
+<h3 id="yarn-installer">YARN Installer</h3>
+<p><a class="btn btn-md btn-warning" href="https://asterix-jenkins.ics.uci.edu/job/asterix-test-full/lastStableBuild/org.apache.asterix$asterix-yarn/artifact/org.apache.asterix/asterix-yarn/0.8.7-SNAPSHOT/asterix-yarn-0.8.7-SNAPSHOT-binary-assembly.zip" role="button">Download AsterixDB 0.8.7-SNAPSHOT <i class="fa fa-download fa-lg"></i> </a></p>
+
+<hr />
+
 <h2 id="setting-up-an-asterix-development-environment-in-eclipse">Setting up an Asterix Development environment in Eclipse</h2>
 
 <h3 id="prerequisites">Prerequisites</h3>
diff --git a/content/download.html b/content/download.html
index eef3fa3..691994f 100644
--- a/content/download.html
+++ b/content/download.html
@@ -86,90 +86,99 @@
 <div class="row">
 <div class="col-md-6">
 
-    <p>Feel free to browse and download the source of AsterixDB (and Hyracks) from our GitHub mirror.</p>
+    <p>AsterixDB Source releases as a tarball/zip are available below.
+Feel free to browse and download the source tree of AsterixDB (and Hyracks) from our GitHub mirror.</p>
 
   </div>
 <div class="col-md-6">
 
     <p><a class="btn btn-md btn-info" href="https://github.com/apache/incubator-asterixdb/" role="button">AsterixDB on GitHub <i class="fa fa-github fa-lg"></i></a></p>
     <p><a class="btn btn-md btn-info" href="https://github.com/apache/incubator-asterixdb-hyracks/" role="button">Hyracks on GitHub <i class="fa fa-github fa-lg"></i></a></p>
+    <p><a class="btn btn-md btn-info" href="https://dist.apache.org/repos/dist/release/incubator/asterixdb/" role="button">Source Tarballs <i class="fa fa-download fa-lg"></i></a></p>
 
   </div>
 </div>
 
 <div class="row">
 
+<!--
+<div class="col-md-6" markdown="1">
+### Standalone Cluster Installer
 
-<div class="col-md-6">
-    <h3 id="standalone-cluster-installer">Standalone Cluster Installer</h3>
 
-  </div>
+</div>
 </div>
 
 <div class="row">
 
-<div class="col-md-6">
-    <p>This packaging is most suitable for installation on a cluster without Hadoop or YARN. Choose from either a stable release or the latest build from our master branch.</p>
-  </div>
+<div class="col-md-6" markdown="1">
+This packaging is most suitable for installation on a cluster without Hadoop or YARN. Choose from either a stable release or the latest build from our master branch.
+</div>
 
-<div class="col-md-6">
+<div class="col-md-6" markdown="1">
 
-    <p><a class="btn btn-md btn-success" href="http://asterixdb.ics.uci.edu/download/0.8.6/asterix-installer-0.8.6-binary-assembly.zip" role="button">Download AsterixDB 0.8.6 <i class="fa fa-download fa-lg"></i> </a></p>
-    <p><a class="btn btn-md btn-warning" href="https://asterix-jenkins.ics.uci.edu/job/asterix-test-full/lastStableBuild/org.apache.asterix$asterix-installer/artifact/org.apache.asterix/asterix-installer/0.8.7-SNAPSHOT/asterix-installer-0.8.7-SNAPSHOT-binary-assembly.zip" role="button">Download AsterixDB 0.8.7-SNAPSHOT <i class="fa fa-download fa-lg"></i> </a></p>
-
-  </div>
+<p><a class="btn btn-md btn-success" href="http://asterixdb.ics.uci.edu/download/0.8.6/asterix-installer-0.8.6-binary-assembly.zip" role="button">Download AsterixDB 0.8.6 <i class="fa fa-download fa-lg"></i> </a></p>
+<p><a class="btn btn-md btn-warning" href="https://asterix-jenkins.ics.uci.edu/job/asterix-test-full/lastStableBuild/org.apache.asterix$asterix-installer/artifact/org.apache.asterix/asterix-installer/0.8.7-SNAPSHOT/asterix-installer-0.8.7-SNAPSHOT-binary-assembly.zip" role="button">Download AsterixDB 0.8.7-SNAPSHOT <i class="fa fa-download fa-lg"></i> </a></p>
 
 </div>
 
+</div>
+
+
 <div class="row">
 
 
-<div class="col-md-6">
-    <h3 id="yarn-cluster-installer">YARN Cluster Installer</h3>
+<div class="col-md-6" markdown="1">
+### YARN Cluster Installer
 
-  </div>
+
+</div>
 </div>
 
 <div class="row">
 
-<div class="col-md-6">
-    <p>This is AsterixDB packaged with the YARN installer. If you already have a cluster running Hadoop YARN, this is the easiest way to start out with AsterixDB.</p>
-  </div>
+<div class="col-md-6" markdown="1">
+This is AsterixDB packaged with the YARN installer. If you already have a cluster running Hadoop YARN, this is the easiest way to start out with AsterixDB.
+</div>
 
-<div class="col-md-6">
+<div class="col-md-6" markdown="1">
 
-    <p><a class="btn btn-md btn-warning" href="https://asterix-jenkins.ics.uci.edu/job/asterix-test-full/lastStableBuild/org.apache.asterix$asterix-yarn/artifact/org.apache.asterix/asterix-yarn/0.8.7-SNAPSHOT/asterix-yarn-0.8.7-SNAPSHOT-binary-assembly.zip" role="button">Download AsterixDB 0.8.7-SNAPSHOT <i class="fa fa-download fa-lg"></i> </a></p>
-
-  </div>
+<p><a class="btn btn-md btn-warning" href="https://asterix-jenkins.ics.uci.edu/job/asterix-test-full/lastStableBuild/org.apache.asterix$asterix-yarn/artifact/org.apache.asterix/asterix-yarn/0.8.7-SNAPSHOT/asterix-yarn-0.8.7-SNAPSHOT-binary-assembly.zip" role="button">Download AsterixDB 0.8.7-SNAPSHOT <i class="fa fa-download fa-lg"></i> </a></p>
 
 </div>
 
+</div>
+
+
 <div class="row">
 
 
-<div class="col-md-6">
-    <h3 id="extras">Extras</h3>
+<div class="col-md-6" markdown="1">
+### Extras
 
-  </div>
+
+</div>
 </div>
 
 <div class="row">
 
-<div class="col-md-6">
-    <p>APIs, Bindings and Demos. If you’re a developer looking for examples of how to build an application on top of or integrated with AsterixDB, these should help you get started.</p>
+<div class="col-md-6" markdown="1">
+APIs, Bindings and Demos. If you're a developer looking for examples of how to build an application on top of or integrated with AsterixDB, these should help you get started.
 
-  </div>
-
-<div class="col-md-6">
-
-    <p><a class="btn btn-md btn-success" href="https://asterixdb.ics.uci.edu/download/demos/tweetbook-demo.zip" role="button">Download the TweetBook Demo <i class="fa fa-download fa-lg"></i> </a></p>
-
-    <p><a class="btn btn-md btn-success" href="https://asterixdb.ics.uci.edu/download/demos/admaql101-demo.zip" role="button">Download the AsterixDB ADM &amp; AQL 101 Demo <i class="fa fa-download fa-lg"></i> </a></p>
-
-    <p><a class="btn btn-md btn-success" href="https://asterixdb.ics.uci.edu/download/bindings/asterix-sdk-stable.js" role="button">Download AsterixDB Javascript Bindings <i class="fa fa-download fa-lg"></i> </a></p>
-  </div>
 </div>
 
+<div class="col-md-6" markdown="1">
+
+<p><a class="btn btn-md btn-success" href="https://asterixdb.ics.uci.edu/download/demos/tweetbook-demo.zip" role="button">Download the TweetBook Demo <i class="fa fa-download fa-lg"></i> </a></p>
+
+<p><a class="btn btn-md btn-success" href="https://asterixdb.ics.uci.edu/download/demos/admaql101-demo.zip" role="button">Download the AsterixDB ADM & AQL 101 Demo <i class="fa fa-download fa-lg"></i> </a></p>
+
+<p><a class="btn btn-md btn-success" href="https://asterixdb.ics.uci.edu/download/bindings/asterix-sdk-stable.js" role="button">Download AsterixDB Javascript Bindings <i class="fa fa-download fa-lg"></i> </a></p>
+</div>
+</div>
+
+-->
+</div>
 
 </div>
 </div>
diff --git a/content/img/msdn.png b/content/img/msdn.png
new file mode 100644
index 0000000..e9f1d16
--- /dev/null
+++ b/content/img/msdn.png
Binary files differ
diff --git a/content/img/tools/gerrit.png b/content/img/tools/gerrit.png
new file mode 100644
index 0000000..e5d95c4
--- /dev/null
+++ b/content/img/tools/gerrit.png
Binary files differ
diff --git a/content/img/tools/intellij-idea-logo.png b/content/img/tools/intellij-idea-logo.png
new file mode 100644
index 0000000..0071c07
--- /dev/null
+++ b/content/img/tools/intellij-idea-logo.png
Binary files differ
diff --git a/content/img/tools/jenkins.png b/content/img/tools/jenkins.png
new file mode 100644
index 0000000..c41233a
--- /dev/null
+++ b/content/img/tools/jenkins.png
Binary files differ
diff --git a/content/img/tools/maven.png b/content/img/tools/maven.png
new file mode 100644
index 0000000..100075e
--- /dev/null
+++ b/content/img/tools/maven.png
Binary files differ
diff --git a/content/img/tools/msdn.png b/content/img/tools/msdn.png
new file mode 100644
index 0000000..e9f1d16
--- /dev/null
+++ b/content/img/tools/msdn.png
Binary files differ
diff --git a/content/img/tools/yk_logo.png b/content/img/tools/yk_logo.png
new file mode 100644
index 0000000..16fcad7
--- /dev/null
+++ b/content/img/tools/yk_logo.png
Binary files differ
diff --git a/content/index.html b/content/index.html
index d5e06fe..15bdd47 100644
--- a/content/index.html
+++ b/content/index.html
@@ -220,13 +220,14 @@
 
 <div class="row">
 <div class="col-md-6">
-    <h3 id="download">Download</h3>
-    <p>You can download the latest stable release here.</p>
+    <!--
+### Download
+You can download the latest stable release here.
 
-    <p><a class="btn btn-md btn-success" href="http://asterixdb.ics.uci.edu/download/0.8.6/asterix-installer-0.8.6-binary-assembly.zip" role="button">Download AsterixDB 0.8.6 <i class="fa fa-download fa-lg"></i></a></p>
+<p><a class="btn btn-md btn-success" href="http://asterixdb.ics.uci.edu/download/0.8.6/asterix-installer-0.8.6-binary-assembly.zip" role="button">Download AsterixDB 0.8.6 <i class="fa fa-download fa-lg"></i></a></p>
 
-    <p>See the installation <a href="http://asterixdb.ics.uci.edu/documentation/install.html">guide</a>, and check out <a href="http://asterixdb.ics.uci.edu/documentation/aql/primer.html">AsterixDB 101</a> to start using AsterixDB right away.</p>
-
+See the installation [guide](http://asterixdb.ics.uci.edu/documentation/install.html), and check out [AsterixDB 101](http://asterixdb.ics.uci.edu/documentation/aql/primer.html) to start using AsterixDB right away.
+!-->
   </div>
 <div class="col-md-6">
     <h3 id="community-and-support">Community and Support</h3>
diff --git a/content/tools.html b/content/tools.html
new file mode 100644
index 0000000..a3a61eb
--- /dev/null
+++ b/content/tools.html
@@ -0,0 +1,151 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+    <meta name="description" content="">
+    <meta name="author" content="">
+    <link rel="icon" href="https://asterixdb.incubator.apache.org/favicon.ico">
+
+    <title>Tools</title>
+
+    <!-- Bootstrap core CSS -->
+    <link href="https://asterixdb.incubator.apache.org/css/bootstrap.min.css" rel="stylesheet">
+    <!-- Bootstrap theme -->
+
+    <!-- Custom styles for this template -->
+    <link href="https://asterixdb.incubator.apache.org/css/theme.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+    <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
+  </head>
+
+  <div class="container theme-showcase" role="main">
+  <div class="masthead">
+    <p class="lead">
+        <a href="https://asterixdb.incubator.apache.org/index.html"><img src="https://asterixdb.incubator.apache.org/img/asterixdb.png" style="height:75px; width:auto; vertical-align:bottom; margin-top:10px;"/></a>
+    </p>
+</div>
+
+<nav class="navbar navbar-default">
+        <div class="container">
+          <div class="navbar-header">
+            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
+              <span class="sr-only">Toggle navigation</span>
+              <span class="icon-bar"></span>
+              <span class="icon-bar"></span>
+              <span class="icon-bar"></span>
+            </button>
+            <a class="navbar-brand" href="https://asterixdb.incubator.apache.org/index.html">Overview</a>
+          </div>
+          <div class="navbar-collapse collapse">
+            <ul class="nav navbar-nav">
+              <li><a href="https://asterixdb.incubator.apache.org/download.html">Download</a></li>
+              <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Documentation<span class="caret"></span></a>
+                <ul class="dropdown-menu" role="menu">
+                  <li class="dropdown-header">Stable release</li>
+                  <li><a href="http://asterixdb.ics.uci.edu/documentation/index.html">Documentation for 0.8.6<i class="fa fa-external-link fa-sm"></i></a></li>
+                  <li class="divider"></li>
+                  <li class="dropdown-header">Snapshot release</li>
+                  <li><a href="https://asterix-jenkins.ics.uci.edu/job/asterix-test-full/site/asterix-doc/index.html">Documentation for 0.8.7-SNAPSHOT  <i class="fa fa-external-link fa-sm"></i></a></li>
+                </ul>
+              </li>
+              <li><a href="https://asterixdb.incubator.apache.org/about.html">About</a></li>
+              <li><a href="https://asterixdb.incubator.apache.org/community.html">Community</a></li>
+              <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Contributing <span class="caret"></span></a>
+                <ul class="dropdown-menu" role="menu">
+                  <li class="dropdown-header">For New Contributors</li>
+                  <li><a href="https://asterixdb.incubator.apache.org/dev-setup.html">Development Setup</a></li>
+                  <li class="divider"></li>
+                  <li class="dropdown-header">For Committers</li>
+                  <li><a href="https://asterixdb.incubator.apache.org/pushing.html">Pushing changes</a></li>
+                </ul>
+              </li>
+            </ul>
+          </div><!--/.nav-collapse -->
+        </div>
+      </nav>
+
+
+  <div class="row">
+<div class="col-md-10 col-centered">
+<h2>Tools</h2>
+<p>Apache AsterixDB is built and maintained using a variety of open source and commerical tools. This page lists some of them, in no particular order.</p>
+
+<ul id="markdown-toc">
+  <li><a href="#apache-tools" id="markdown-toc-apache-tools">Apache Tools</a></li>
+</ul>
+
+<h3 id="apache-tools">Apache Tools</h3>
+
+<p>|———————————————————————————–|——————-|
+|<img src="https://asterixdb.incubator.apache.org//img/tools/maven.png" height="100" />     |      |</p>
+<hr />
+
+<h4 id="open-source-tools">Open Source Tools</h4>
+
+<table class="table table-striped">
+  <tbody>
+    <tr>
+      <td><img src="https://asterixdb.incubator.apache.org//img/tools/jenkins.png" height="100" /></td>
+      <td> </td>
+    </tr>
+    <tr>
+      <td><img src="https://asterixdb.incubator.apache.org//img/tools/gerrit.png" height="100" /></td>
+      <td>Gerrit is used by the majority of developers as a staging repository for new changes and as a code review tool</td>
+    </tr>
+  </tbody>
+</table>
+
+<hr />
+
+<h4 id="commercial-tools">Commercial Tools</h4>
+
+<table class="table table-striped">
+  <tbody>
+    <tr>
+      <td><img src="https://asterixdb.incubator.apache.org//img/tools/yourkit.png" height="100" /></td>
+      <td>YourKit whenever a hard to</td>
+    </tr>
+    <tr>
+      <td><img src="https://asterixdb.incubator.apache.org//img/tools/intellij.png" height="100" /></td>
+      <td> </td>
+    </tr>
+  </tbody>
+</table>
+
+</div>
+</div>
+
+
+   <hr />
+
+   <footer>
+        <div class="row">
+        <div class="col-md-6 col-md-offset-3  text-center">
+        <p>&copy; Copyright 2015 The Apache Software foundation. All Rights Reserved. </p>
+        <p>Apache AsterixDB, Apache, and the Apache feather logo are trademarks of the Apache Software Foundation</p>
+        </div>
+        <div class="col-md-1 text-right">
+        <img src="https://asterixdb.incubator.apache.org/img/egg-logo.png" style="height:auto; width:200px; vertical-align:bottom;"/>
+        </div>
+        </div>
+   </footer>
+    </div> <!-- /container -->
+
+
+    <!-- Bootstrap core JavaScript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <script src="https://asterixdb.incubator.apache.org/js/bootstrap.min.js"></script>
+  </body>
+</html>