Merge branch 'master' into usergrid-1007-shiro-cache

README-Docs.md

@@ -0,0 +1,13 @@
+Apache Usergrid Website and Docs
+================================
+
+Usergrid docs and website can be found in these directories:
+
+* __website__: This is the source for the website, it is written in Markdown and uses Pandoc to generate HTML.
+* __docs__: This is the source for the documentation, it is written in Markdown and uses Sphinx to generate HTML.
+* __contents__: This is the target directory for our website and docs generation tools. 
+
+Refer to the README files in the __website__ and __docs__ directories for instructions on how to add and modify
+the website and docs, how to run the generators and how to ensure that the __contents__ directory gets published
+to __usergrid.apache.org__.
+

README.md

@@ -1,17 +1,18 @@
 Apache Usergrid
 ===============
 
-__WARNING__: This is the __two-dot-o__ branch and work is underway here on a new persistence system for Usergrid. We refer to the new persistence system as Core Persistence and you can find its modules in the stack/corepersistence directory. 
+__WARNING__: The Usergrid master branch represents and un-released Usergrid 2.x version with a completely new persistence and query engine. This new engine requires some new components. In addition to a Cassandra cluster, Usergrid 2.x also requires an ElasticSearch cluster and a distributed Queue system (currently only AWS SQS is supported). 
 
 Overview
 --------
 
 **Apache Usergrid is a multi-tenant Backend-as-a-Service stack for web & mobile applications, based on RESTful APIs.**
 
-##Contributing
+## Contributing
+
 We accept all contributions via our GitHub, so you can fork our repo (apache/usergrid) and then submit a PR back to us for approval. For larger PRs you'll need to have an ICLA form on file with Apache. For more information see our [Contribution Workflow Policy](https://cwiki.apache.org/confluence/display/usergrid/Usergrid+Contribution+Workflow), and specifically our [External Contributors Guide](https://cwiki.apache.org/confluence/display/usergrid/Usergrid+External+Contributors+Guide).
 
-##Build awesome apps with Usergrid!
+## Build awesome apps with Usergrid!
 
 Apache Usergrid provides all code necessary to build and power modern mobile applications.  This includes the server stack, administrative portal website, SDKs in most popular languages, as well as command line tools. 
 
@@ -25,6 +26,7 @@ Look for much more detailed README files in their corresponding subdirectories,
 
 * a command-line client “ugc” allowing you to complete most maintenance tasks, as well as queries in a manner similar to the mysql or the mongo shell, located under [`/ugc`](ugc). You can install it on your machine with a simple `sudo gem install ugc`
 
-##For more information
+## For more information
+
 See the [Apache Usergrid web site](http://usergrid.apache.org/).
 

content/community/index.html

@@ -402,6 +402,14 @@ <h2 class="icns-group" id="committers"><span>Committers</span></h2>
 				<img src="/img/grey.png" />
 				<p>George Reyes</p>
 			</div>
+			<div class="col-md-2 text-center">
+				<img src="/img/mike_d.jpg" />
+				<p>Mike Dunker</p>
+			</div>
+			<div class="col-md-2 text-center">
+				<img src="/img/michael_r.jpg" />
+				<p>Michael Russo</p>
+			</div>
 			<div class="col-md-2 text-center">
 				<img src="/img/nate.jpg" />
 				<p>Nate McCall</p>
@@ -414,6 +422,8 @@ <h2 class="icns-group" id="committers"><span>Committers</span></h2>
 				<img src="/img/scott.jpg" />
 				<p>Scott Ganyo</p>
 			</div>
+		</div>
+		<div class="row">
 			<div class="col-md-2 text-center">
 				<img src="/img/stliu.jpg" />
 				<p>Shaozhuang Liu</p>
@@ -422,8 +432,6 @@ <h2 class="icns-group" id="committers"><span>Committers</span></h2>
 				<img src="/img/shawn.jpg" />
 				<p>Shawn Feldman</p>
 			</div>
-		</div>
-		<div class="row">
 			<div class="col-md-2 text-center">
 				<img src="/img/sungju.jpg" />
 				<p>Sungju Jin</p>
@@ -440,12 +448,22 @@ <h2 class="icns-group" id="committers"><span>Committers</span></h2>
 				<img src="/img/github.png" />
 				<p>Yigit Sapli</p>
 			</div>
+		</div>
+		<div class="row">
 			<div class="col-md-2 text-center">
 				<img src="/img/jeff.jpg" />
 				<p>Jeff West</p>
 			</div>
 			<div class="col-md-2 text-center">
 			</div>
+			<div class="col-md-2 text-center">
+			</div>
+			<div class="col-md-2 text-center">
+			</div>
+			<div class="col-md-2 text-center">
+			</div>
+			<div class="col-md-2 text-center">
+			</div>
 		</div>
 	</div>
 </section>