diff --git a/content/archives.html b/content/archives.html
index 585c481..e583d14 100644
--- a/content/archives.html
+++ b/content/archives.html
@@ -220,6 +220,7 @@
 <h3>CloudMonkey release archives</h3>
 
 <ul>
+  <li><a href="http://archive.apache.org/dist/cloudstack/releases/cloudmonkey-6.0.0/">apache-cloudstack-cloudmonkey-6.0.0</a></li>
   <li><a href="http://archive.apache.org/dist/cloudstack/releases/cloudmonkey-5.3.2/">apache-cloudstack-cloudmonkey-5.3.2</a></li>
   <li><a href="http://archive.apache.org/dist/cloudstack/releases/cloudmonkey-5.3.1/">apache-cloudstack-cloudmonkey-5.3.1</a></li>
   <li><a href="http://archive.apache.org/dist/cloudstack/releases/cloudmonkey-5.3.0/">apache-cloudstack-cloudmonkey-5.3.0</a></li>
diff --git a/content/developers b/content/developers
index 8c9aaa6..cc3e17e 100644
--- a/content/developers
+++ b/content/developers
@@ -28,9 +28,10 @@
 </ul>
 </p>
 
-<p>Apache CloudStack has a read-only mirror on <a href="https://github.com/apache/cloudstack" target="_blank">GitHub</a> that is kept in sync with the canonical Git repo maintained by the Apache Software Foundation. Submitting GitHub pull requests is the easiest way to get your contribution upstream. For detailed instructions see the link below:</p>
-
-<br /><a href="https://github.com/apache/cloudstack/blob/master/CONTRIBUTING.md" target="_blank">GitHub Contribution Guidelines</a>&lt;/br&gt;
+<p>Apache CloudStack has a read-only mirror on <a href="https://github.com/apache/cloudstack" target="_blank">GitHub</a> that is kept in sync with the
+canonical Git repo maintained by the Apache Software Foundation. Submitting GitHub pull requests is the easiest way to get your contribution upstream.
+For detailed instructions see the link below:<br />
+<a href="https://github.com/apache/cloudstack/blob/master/CONTRIBUTING.md" target="_blank">GitHub Contribution Guidelines</a></p>
 
 <h3>Submitting a patch through JIRA</h3>
 
@@ -42,56 +43,123 @@
 
 <p>In short, communication is a vital part of making a contribution to an Apache project.</p>
 
-<h3> Getting Started </h3>
+<h3>Getting Started</h3>
 
-<p>First, lets make sure that you've added your name and email to your `~/.gitconfig`:</p>
+<h4>Fork the code</h4>
+
+<p>In your browser, navigate to: <a href="https://github.com/apache/cloudstack">https://github.com/apache/cloudstack</a>.</p>
+
+<p>Fork the repository by clicking on the 'Fork' button on the top right hand side.  The fork will happen and you will be taken to your own
+fork of the repository. Copy the Git repository URL by clicking on the clipboard next to the URL on the right hand side of the page under '<b>HTTPS</b> clone URL'.
+You will paste this URL when doing the following <code>git clone</code> command.</p>
+
+On your computer, follow these steps to setup a local repository for working on ACS:
 
 <pre>
-$ git config --global user.name "Your Name"
-$ git config --global user.email you@domain.com
+$ git clone https://github.com/YOUR_ACCOUNT/cloudstack.git
+$ cd cloudstack
+$ git remote add upstream https://github.com/apache/cloudstack.git
+$ git checkout master
+$ git fetch upstream
+$ git rebase upstream/master
 </pre>
 
-<p>You'll grab the CloudStack source with git:</p>
+<h4>Making Changes</h4>
+
+<p>It is important that you create a new branch to make changes on and that you do not change the
+<code>master</code> branch (other than to rebase in changes from <code>upstream/master</code>).  In this example I will assume you will be making your changes
+to a branch called <code>feature_x</code>. This <code>feature_x</code> branch will be created on your local repository and will be pushed to your
+forked repository on GitHub. Once this branch is on your fork you will create a Pull Request for the changes to be added to the ACS project.</p>
+
+<p>It is best practice to create a new branch each time you want to contribute to the project and only track the changes for that pull request in this branch.</p>
 
 <pre>
-$ git clone https://gitbox.apache.org/repos/asf/cloudstack.git
+$ git checkout -b feature_x
+   (make your changes)
+$ git status
+$ git add .
+$ git commit -a -m "descriptive commit message for your changes"
 </pre>
 
-<p>If you already have the source, make sure you're working with the most recent version. Do a `git pull` if you cloned the source more than a few hours ago. (Apache CloudStack development can move pretty fast!)</p>
+<blockquote>The <code>-b</code> specifies that you want to create a new branch called <code>feature_x</code>.  You only specify <code>-b</code> the first time you
+checkout because you are creating a new branch.  Once the <code>feature_x</code> branch exists, you can later switch to it with only <code>git checkout feature_x</code>.</blockquote>
+
+<h4>Rebase <code>feature_x</code> to include updates from <code>upstream/master</code></h4>
+
+<p>It is important that you maintain an up-to-date <code>master</code> branch in your local repository.  This is done by rebasing in the code
+changes from <code>upstream/master</code> (the official ACS project repository) into your local repository.  You will want to do this before you start
+working on a feature as well as right before you submit your changes as a pull request. We recommend you do this process periodically while you work to make
+sure you are working off the most recent project code.</p>
+
+<p>This process will do the following:</p>
+
+<ol>
+  <li>Checkout your local <code>master</code> branch;</li>
+  <li>Synchronize your local <code>master</code> branch with the <code>upstream/master</code> so you have all the latest changes from the project;</li>
+  <li>Rebase the latest project code into your <code>feature_x</code> branch so it is up-to-date with the upstream code.</li>
+</ol>
 
 <pre>
-$ git checkout -b mybranch
+$ git checkout master
+$ git fetch upstream
+$ git rebase upstream/master
+$ git checkout feature_x
+$ git rebase master
 </pre>
 
-<p>This does two things: One, it creates the branch <em>mybranch</em> and two, it changes your working branch to <em>mybranch</em>. Running `git branch` will show you which branch you're working on, with an asterisk next to the active branch, like so:</p>
+<blockquote>Now your <code>feature_x</code> branch is up-to-date with all the code in <code>upstream/master</code>.</blockquote>
+
+<h4>Make a GitHub pull request to contribute your changes</h4>
+
+<p>When you are happy with your changes and you are ready to contribute them, you will create a Pull Request on GitHub to do so.
+This is done by pushing your local changes to your forked repository (default remote name is <code>origin</code>) and then initiating a pull request on GitHub.</p>
+
+<p>Please include JIRA ID or GitHub ID, detailed information about the bug/feature, what all tests are executed, how the reviewer can test this
+feature etc. Incase of UI PRs, a screenshot is preferred.</p>
+
+<blockquote><b>IMPORTANT:</b>Make sure you have rebased your <code>feature_x</code> branch to include the latest code from <code>upstream/master</code> <b>before</b>
+you do this.</blockquote>
 
 <pre>
-[user@localhost cloudstack]$ git branch
-  master
-  * mybranch
-  </pre>
+$ git push origin master
+$ git push origin feature_x
+</pre>
 
-<p>Make whatever changes you're going to make, be sure to use <code>git add</code> to stage the changes, and then you're going to commit the changes to your working branch:</p>
+<p>Now that the <code>feature_x</code> branch has been pushed to your GitHub repository, you can initiate the pull request.</p>
 
-<pre>git commit -m "Insert a meaningful summary of changes here."</pre>
+<p>To initiate the pull request, do the following:</p>
 
-<p>Finally, you can create a patch and attach it to the JIRA issue that you created for the bug you are fixing.</p>
+<ol>
+<li>In your browser, navigate to your forked repository: <b>https://github.com/YOUR_ACCOUNT/cloudstack</b>;</li>
+<li>Click the new button called '<b>Compare &amp; pull request</b>' that showed up just above the main area in your forked repository;</li>
+<li>Validate the pull request will be into the upstream <code>master</code> and will be from your <code>feature_x</code> branch;</li>
+<li>Enter a detailed description of the work you have done and then click '<b>Send pull request</b>'.</li>
+</ol>
 
-<pre>git format-patch master --stdout &gt; ~/patch-name.patch</pre>
+<p>If you are requested to make modifications to your proposed changes, make the changes locally on your <code>feature_x</code> branch, re-push
+the <code>feature_x</code> branch to your fork. The existing pull request should automatically pick up the change and update accordingly.</p>
 
-<h3>Review</h3>
+<h4>Cleaning up after a successful pull request</h4>
 
-<p>Once you've submitted your pull request, you should receive a response within a few days. If you receive no response within a week, please ping the cloudstack-dev mailing list (dev@cloudstack.apache.org).</p>
+<p>Once the <code>feature_x</code> branch has been committed into the <code>upstream/master</code> branch, your local <code>feature_x</code> branch
+and the <code>origin/feature_x</code> branch are no longer needed. If you want to make additional changes, restart the process with a new branch.</p>
 
-<h3>Screencast</h3>
+<blockquote><b>IMPORTANT:</b>Make sure that your changes are in <code>upstream/master</code>before you delete your <code>feature_x</code>
+and <code>origin/feature_x</code> branches!</blockquote>
 
-<p>If you are new to git you might want to watch this screencast:</p>
+<p>You can delete these deprecated branches with the following:</p>
 
-<iframe width="560" height="315" src="//www.youtube.com/embed/3c5JIW4onGk?list=PLb899uhkHRoZCRE00h_9CRgUSiHEgFDbC" frameborder="0" allowfullscreen=""></iframe>
+<pre>
+$ git checkout master
+$ git branch -D feature_x
+$ git push origin :feature_x
+</pre>
 
 <h3>Further Reading</h3>
 
-<p>You might want to peruse the <a href="http://www.apache.org/foundation/getinvolved.html" target="_blank">Get Involved</a> page on Apache.org, and the <a href="http://commons.apache.org/patches.html" target="_blank">On Contributing Patches</a> doc as well. Note that some of that does not apply to Apache CloudStack, as we're using git rather than Subversion. But do respect the original style of the CloudStack code, and ensure that you're using spaces rather than tabs, and your patches have Unix line endings (LF) rather than Windows-type line endings (CRLF).</p>
+<p>You might want to peruse the <a href="http://www.apache.org/foundation/getinvolved.html" target="_blank">Get Involved</a> page on Apache.org.
+Please, respect the original style of the CloudStack code, and ensure that you're using spaces rather than tabs, and your code have Unix line
+endings (LF) rather than Windows-type line endings (CRLF).</p>
 
 </div>
 
@@ -126,7 +194,7 @@
 
 <div class="panel-heading">
                 
-<h3 class="panel-title">Git Repositories</h3>
+<h3 class="panel-title">CloudStack Git Repositories</h3>
               
 </div>
               
@@ -137,18 +205,17 @@
 <ul>
 <li><a href="https://gitbox.apache.org/repos/asf/cloudstack.git" target="_blank">Apache CloudStack source code</a></li>
 <li><a href="https://gitbox.apache.org/repos/asf/cloudstack-cloudmonkey.git" target="_blank">Apache CloudStack Cloudmonkey source code</a></li>
-<li><a href="https://github.com/apache/cloudstack-ec2stack" target="_blank">Apache CloudStack EC2stack Inteface</a></li>
-<li><a href="https://github.com/apache/cloudstack-gcestack" target="_blank">Apache CloudStack GCEstack Interface</a></li>
-<li><a href="https://github.com/apache/cloudstack-docs" target="_blank">General Documentation</a></li>
-<li><a href="https://github.com/apache/cloudstack-docs-install" target="_blank">Installation Guide</a></li>
-<li><a href="https://github.com/apache/cloudstack-docs-admin" target="_blank">Administrative Guide</a></li>
-<li><a href="https://github.com/apache/cloudstack-docs-rn" target="_blank">Release Notes</a></li>
+<li><a href="https://github.com/apache/cloudstack-documentation" target="_blank">Documentation</a></li>
 <li><a href="https://github.com/apache/cloudstack-www" target="_blank">Apache CloudStack Website</a></li>
 </ul>
 
 <p>To get the most recent source for Apache CloudStack, use:</p>
 
 <pre>
+git clone https://github.com/apache/cloudstack.git
+</pre>
+or
+<pre>
 git clone https://gitbox.apache.org/repos/asf/cloudstack.git
 </pre>
 
diff --git a/content/downloads.html b/content/downloads.html
index 0a10e6b..bcfe65c 100644
--- a/content/downloads.html
+++ b/content/downloads.html
@@ -302,39 +302,25 @@
 
 <h4 id="source-release">Source Release</h4>
 
-<p>CloudMonkey's current release is 5.3.3.</p>
+<p>CloudMonkey's current release is 6.0.0.</p>
 
 <p>
-<a href="http://www.apache.org/dyn/closer.lua/cloudstack/releases/cloudmonkey-5.3.3/apache-cloudstack-cloudmonkey-5.3.3-src.tar.bz2"><button type="button" class="btn btn-primary btn-md">Get the 5.3.3 Source</button></a>
+<a href="http://www.apache.org/dyn/closer.lua/cloudstack/releases/cloudmonkey-6.0.0/apache-cloudstack-cloudmonkey-6.0.0-src.tar.bz2"><button type="button" class="btn btn-primary btn-md">Get the 6.0.0 Source</button></a>
 
 <a href="http://www.apache.org/dist/cloudstack/KEYS"><button type="button" class="btn btn-info btn-xs">KEYS</button></a>
-<a href="http://www.apache.org/dist/cloudstack/releases/cloudmonkey-5.3.3/apache-cloudstack-cloudmonkey-5.3.3-src.tar.bz2.asc"><button type="button" class="btn btn-info btn-xs">PGP</button></a>
-<a href="http://www.apache.org/dist/cloudstack/releases/cloudmonkey-5.3.3/apache-cloudstack-cloudmonkey-5.3.3-src.tar.bz2.md5"><button type="button" class="btn btn-info btn-xs">MD5</button></a>
-<a href="http://www.apache.org/dist/cloudstack/releases/cloudmonkey-5.3.3/apache-cloudstack-cloudmonkey-5.3.3-src.tar.bz2.sha"><button type="button" class="btn btn-info btn-xs">SHA</button></a>
+<a href="http://www.apache.org/dist/cloudstack/releases/cloudmonkey-6.0.0/apache-cloudstack-cloudmonkey-6.0.0-src.tar.bz2.asc"><button type="button" class="btn btn-info btn-xs">PGP</button></a>
+<a href="http://www.apache.org/dist/cloudstack/releases/cloudmonkey-6.0.0/apache-cloudstack-cloudmonkey-6.0.0-src.tar.bz2.md5"><button type="button" class="btn btn-info btn-xs">MD5</button></a>
+<a href="http://www.apache.org/dist/cloudstack/releases/cloudmonkey-6.0.0/apache-cloudstack-cloudmonkey-6.0.0-src.tar.bz2.sha"><button type="button" class="btn btn-info btn-xs">SHA</button></a>
 
 </p>
 
 <p>Instructions for building and installing from source can be found in the included <a href="https://gitbox.apache.org/repos/asf?p=cloudstack-cloudmonkey.git;a=blob_plain;f=README.md">README.md</a> file.</p>
 
-<h4 id="pypi-package">PyPi Package</h4>
+<h4 id="github-release">Binary Builds Release</h4>
 
-<p>For easier installation or upgrades, the official source code release has been supplemented by community members who have pushed the python package to the <a href="https://pypi.python.org/pypi/cloudmonkey/">Python Package Index</a>.</p>
+<p>For easier installation or upgrades, the official source code release has been supplemented by community members who have pushed the python package to the <a href="https://github.com/apache/cloudstack-cloudmonkey/releases">Apache CloudStack CloudMonkey Github release</a> page.</p>
 
-<p>For installing the package from pypi, use:</p>
-
-<pre><code>$ pip install cloudmonkey
-</code></pre>
-
-<p>To upgrade:</p>
-
-<pre><code>$ pip install --upgrade cloudmonkey
-</code></pre>
-
-<p>Though a clean upgrade is recommended:</p>
-
-<pre><code>$ pip uninstall cloudmonkey
-$ pip install cloudmonkey
-</code></pre>
+<p>For installing, upgrade, usage, please see the project <a href="https://github.com/apache/cloudstack-cloudmonkey/wiki/Getting-Started#installation">wiki</a>.</p>
 
 <p><a name="archives"></a></p>
 
diff --git a/content/mailing-lists b/content/mailing-lists
index 67c6e90..07fe45e 100644
--- a/content/mailing-lists
+++ b/content/mailing-lists
@@ -17,24 +17,31 @@
 <p>The project currently has several lists:</p>
 
 <ul>
-  <li><a href="http://mail-archives.apache.org/mod_mbox/cloudstack-announce/">announce@</a>: Project release, security and other announcements. This is a very low volume list.</li>
-  <li><a href="http://mail-archives.apache.org/mod_mbox/cloudstack-users/">users@</a>: This list is for users of CloudStack to seek and provide support. This is a moderately high volume list.</li>
-  <li><a href="http://mail-archives.apache.org/mod_mbox/cloudstack-dev/">dev@</a>: Where discussions about development and the project itself happen. This is a high volume list.</li>
-  <li><a href="http://mail-archives.apache.org/mod_mbox/cloudstack-commits/">commits@</a>: This list is for commits to the CloudStack git repository. It's a high volume list with automated messages, probably of limited interest to anyone who is not actively developing Apache CloudStack.</li>
-  <li><a href="http://mail-archives.apache.org/mod_mbox/cloudstack-issues/">issues@</a>: Notifications from CloudStack's Jira project. This is a high volume list.</li>
-  <li><a href="http://mail-archives.apache.org/mod_mbox/cloudstack-marketing/">marketing@</a>: Discussions about marketing CloudStack.</li>
+  <li><a href="https://lists.apache.org/list.html?announce@cloudstack.apache.org">announce@</a>: Project release, security and other announcements. This is a very low volume list.</li>
+  <li><a href="https://lists.apache.org/list.html?users@cloudstack.apache.org">users@</a>: This list is for users of CloudStack to seek and provide support. This is a moderately high volume list.</li>
+  <li><a href="https://lists.apache.org/list.html?dev@cloudstack.apache.org">dev@</a>: Where discussions about development and the project itself happen. This is a high volume list.</li>
+  <li><a href="https://lists.apache.org/list.html?commits@cloudstack.apache.org">commits@</a>: This list is for commits to the CloudStack git repository. It's a high volume list with automated messages, probably of limited interest to anyone who is not actively developing Apache CloudStack.</li>
+  <li><a href="https://lists.apache.org/list.html?issues@cloudstack.apache.org">issues@</a>: Notifications from CloudStack's Jira project. This is a high volume list.</li>
+  <li><a href="https://lists.apache.org/list.html?marketing@cloudstack.apache.org">marketing@</a>: Discussions about marketing CloudStack.</li>
 </ul>
 
 <p>The preferred language to use on the lists above is English. To support the global nature of the CloudStack user community, we also have the following regionally specific user lists:</p>
 
 <ul>
-  <li><a href="http://mail-archives.apache.org/mod_mbox/cloudstack-users-cn/">users-cn@</a>: Chinese</li>
+  <li><a href="https://lists.apache.org/list.html?users-cn@cloudstack.apache.org">users-cn@</a>: Chinese</li>
 </ul>
 
-<form action="http://markmail.org/search/list:org.apache.incubator.cloudstack-*">
-<strong>Search the CloudStack Mailing Lists on MarkMail</strong>: <input type="text" name="q" size="50" />
-<input type="submit" value="Search" />
-</form>
+<div>
+	<strong>Search the CloudStack Mailing Lists</strong>: <input id="queryStringToSearchOnMailingList" type="text" name="q" size="60" />
+	<a id="searchOnCloudStackMailingLists" class="button" target="_blank" href="#">Search</a>
+</div>
+
+<script>
+	var searchEmailListBaseUrl = "https://lists.apache.org/list.html?users@cloudstack.apache.org:lte=1M&q=";
+	$('#queryStringToSearchOnMailingList').change(function(){
+		$('#searchOnCloudStackMailingLists').attr('href', searchEmailListBaseUrl + $(this).val());
+	});
+</script>
 
 <h2 id="to-subscribe-to-the-mailing-lists">To Subscribe to the Mailing Lists</h2>
 
diff --git a/content/survey b/content/survey
index a0a3ac6..9ab4344 100644
--- a/content/survey
+++ b/content/survey
@@ -12,6 +12,6 @@
 
 </div>
 
-<iframe height="2000" allowtransparency="true" frameborder="0" scrolling="yes" style="width:100%;border:none" src="//www.formwize.com/run/survey3.cfm?id=7191&amp;embed">
-<a href="//www.formwize.com/run/survey3.cfm?id=7191" title="CloudStack Survey">Fill out my form</a>
+<iframe height="2000" allowtransparency="true" frameborder="0" scrolling="yes" style="width:100%;border:none" src="https://www.formwize.com/run/survey3.cfm?idx=505d040e080008&amp;embed">
+<a href="https://www.formwize.com/run/survey3.cfm?idx=505d040e080008" title="CloudStack Survey">Fill out my form</a>
 </iframe>
diff --git a/content/users b/content/users
index 23d63bf..1b881d1 100644
--- a/content/users
+++ b/content/users
@@ -16,20 +16,20 @@
 
 <p>Our users include many major service providers running CloudStack to offer public cloud services, product vendors who incorporate or integrate with Cloudstack in their own products, organisations who have used Cloudstack to build their own private clouds, and systems integrators that offer CloudStack related services.</p>
 
-<p><strong>Are you using CloudStack ?</strong></p>
+<h2 id="how-to-add-your-company-in-the-list">How to Add your Company in The List</h2>
 
-<p>If you are using CloudStack in your organisation and your company is not listed here, please complete our brief adoption <a href="/survey.html">survey</a>. We’re happy to keep your company name anonymous if you require.</p>
+<p>If you are using CloudStack in your organisation and your company is not listed here, please send a pull request to the GitHub <a href="https://github.com/apache/cloudstack-www/blob/master/source/users.markdown">page</a>.</p>
 
-<p><strong>Noticed Something wrong ?</strong></p>
+<h2 id="how-to-request-the-entry-removal-or-change">How to Request the Entry Removal or Change</h2>
 
-<p>If you noticed something wrong  with your entry here (or if you’d like us to remove it), please complete our adoption <a href="/survey.html">survey</a>. We will use the information you give us in this survey to update the contents of this page</p>
+<p>If you noticed something wrong with your entry here (or if you’d like us to remove it), please send a pull request to the GitHub <a href="https://github.com/apache/cloudstack-www/blob/master/source/users.markdown">page</a> or write your concerns to the mail-list <strong>users@cloudstack.apache.org</strong>.</p>
 
 <ul>
   <li><a href="http://www.actonmagic.com">ActOnMagic</a></li>
   <li><a href="http://www.appcore.com">Appcore</a></li>
   <li><a href="http://axiomio.com">AxiomIO</a></li>
   <li><a href="http://www.ayaline.com">Ayaline</a></li>
-  <li><a href="http://www.bautzen-it.de">BIT.Group GmbH</a></li>
+  <li><a href="https://itelligencegroup.com/de/trends/cloud-loesungen/">Itelligence Global Managed Services GmbH</a></li>
   <li><a href="http://btcloud.bt.com">BT</a></li>
   <li><a href="http://www.cloudops.com">CloudOps</a></li>
   <li><a href="http://www.codero.com">Codero</a></li>
@@ -52,12 +52,14 @@
   <li><a href="http://nectar.org.au">Melbourne University</a></li>
   <li><a href="http://www.miriadis.com">Miriadis</a></li>
   <li><a href="http://neobitti.fi">Neobitti</a></li>
+  <li><a href="https://netpoint-dc.com/">NetPoint</a></li>
   <li><a href="http://www.openminds.be">Openminds</a></li>
   <li><a href="http://stacksquare.com">Overweb srl</a></li>
   <li><a href="http://polcom.com.pl">Polcom</a></li>
   <li><a href="http://www.reliablenetworks.com">Reliable Networks</a></li>
   <li><a href="http://www.redbridge.se">Redbridge</a></li>
   <li><a href="https://www.safeswisscloud.ch">SafeSwiss Cloud</a></li>
+  <li><a href="https://www.hiagdata.com">HIAG Data AG</a></li>
   <li><a href="http://www.sjcloud.cn/index.xhtml">SJC Inc</a></li>
   <li><a href="http://www.telia.lv">Telia Latvia</a></li>
   <li><a href="http://www.tqhosting.com">Tranquil Hosting</a></li>
@@ -81,7 +83,6 @@
   <li>Amdocs</li>
   <li>Amysta</li>
   <li>Angani</li>
-  <li>Anolim</li>
   <li>Apalia</li>
   <li>Appcara Inc.</li>
   <li>Appcore</li>
diff --git a/content/who b/content/who
index 4db9733..11dba4d 100644
--- a/content/who
+++ b/content/who
@@ -43,10 +43,6 @@
       <td>Animesh</td>
     </tr>
     <tr>
-      <td>bhaisaab</td>
-      <td>Rohit Yadav</td>
-    </tr>
-    <tr>
       <td>boris</td>
       <td>Boris Schrijver</td>
     </tr>
@@ -179,6 +175,10 @@
       <td>Remi Bergsma</td>
     </tr>
     <tr>
+      <td>rohit</td>
+      <td>Rohit Yadav</td>
+    </tr>
+    <tr>
       <td>sebgoa</td>
       <td>Sebastien Goasguen</td>
     </tr>
@@ -264,10 +264,6 @@
       <td>Brian Federle</td>
     </tr>
     <tr>
-      <td>bhaisaab</td>
-      <td>Rohit Yadav</td>
-    </tr>
-    <tr>
       <td>boris</td>
       <td>Boris Schrijver</td>
     </tr>
@@ -568,6 +564,10 @@
       <td>Rene Moser</td>
     </tr>
     <tr>
+      <td>rohit</td>
+      <td>Rohit Yadav</td>
+    </tr>
+    <tr>
       <td>sailajamada</td>
       <td>Sailaja Mada</td>
     </tr>