updating team affiliations
diff --git a/content/about.html b/content/about.html
index e099103..07e66f9 100644
--- a/content/about.html
+++ b/content/about.html
@@ -185,7 +185,7 @@
 
         <div class="row">
             <div class="col-lg-12">
-                <p class="footer-copyright">Copyright &copy; 2016 The Apache Software Foundation, Licensed under the <a
+                <p class="footer-copyright">Copyright &copy; 2021 The Apache Software Foundation, Licensed under the <a
                         class="white-text" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
                 </p>
                 <p class="footer-copyright">Apache Airavata, Airavata, Apache, Apache Airavata Logo and the Apache
diff --git a/content/collaborations.html b/content/collaborations.html
index b838bc1..bc56ce7 100644
--- a/content/collaborations.html
+++ b/content/collaborations.html
@@ -295,7 +295,7 @@
 
         <div class="row">
             <div class="col-lg-12">
-                <p class="footer-copyright">Copyright &copy; 2016 The Apache Software Foundation, Licensed under the <a
+                <p class="footer-copyright">Copyright &copy; 2021 The Apache Software Foundation, Licensed under the <a
                         class="white-text" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
                 </p>
                 <p class="footer-copyright">Apache Airavata, Airavata, Apache, Apache Airavata Logo and the Apache
diff --git a/content/community.html b/content/community.html
index ff0d278..bf2509b 100644
--- a/content/community.html
+++ b/content/community.html
@@ -99,9 +99,9 @@
                 <th scope="row">Aarushi Bisht</th>
                 <td scope="row">aarushi</td>
                 <td scope="row">aarushi [at] apache [dot] org</td>
-                <td scope="row">Indiana University</td>
+                <td scope="row">Unity Technologies</td>
                 <td scope="row">committer</td>
-                <td scope="row">-5</td>
+                <td scope="row">-8</td>
               </tr>
             
               <tr>
@@ -144,7 +144,7 @@
                 <th scope="row">Ate Douma</th>
                 <td scope="row">ate</td>
                 <td scope="row">ate [at] apache [dot] org</td>
-                <td scope="row">Hippo</td>
+                <td scope="row">Bloomreach</td>
                 <td scope="row">committer, PMC, Incubation Mentor</td>
                 <td scope="row">+1</td>
               </tr>
@@ -477,7 +477,7 @@
                 <th scope="row">Viknes Balasubramanee</th>
                 <td scope="row">viknesb</td>
                 <td scope="row">viknesb [at] apache [dot] org</td>
-                <td scope="row">Interana</td>
+                <td scope="row">Twitter</td>
                 <td scope="row">committer</td>
                 <td scope="row">-8</td>
               </tr>
@@ -559,7 +559,7 @@
 
         <div class="row">
             <div class="col-lg-12">
-                <p class="footer-copyright">Copyright &copy; 2016 The Apache Software Foundation, Licensed under the <a
+                <p class="footer-copyright">Copyright &copy; 2021 The Apache Software Foundation, Licensed under the <a
                         class="white-text" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
                 </p>
                 <p class="footer-copyright">Apache Airavata, Airavata, Apache, Apache Airavata Logo and the Apache
diff --git a/content/consensusBuilding.html b/content/consensusBuilding.html
index 7986dd2..cb83ba7 100644
--- a/content/consensusBuilding.html
+++ b/content/consensusBuilding.html
@@ -170,7 +170,7 @@
 
         <div class="row">
             <div class="col-lg-12">
-                <p class="footer-copyright">Copyright &copy; 2016 The Apache Software Foundation, Licensed under the <a
+                <p class="footer-copyright">Copyright &copy; 2021 The Apache Software Foundation, Licensed under the <a
                         class="white-text" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
                 </p>
                 <p class="footer-copyright">Apache Airavata, Airavata, Apache, Apache Airavata Logo and the Apache
diff --git a/content/development.html b/content/development.html
index 3d3b2c5..ca1e647 100644
--- a/content/development.html
+++ b/content/development.html
@@ -503,7 +503,7 @@
 
         <div class="row">
             <div class="col-lg-12">
-                <p class="footer-copyright">Copyright &copy; 2016 The Apache Software Foundation, Licensed under the <a
+                <p class="footer-copyright">Copyright &copy; 2021 The Apache Software Foundation, Licensed under the <a
                         class="white-text" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
                 </p>
                 <p class="footer-copyright">Apache Airavata, Airavata, Apache, Apache Airavata Logo and the Apache
diff --git a/content/get-involved.html b/content/get-involved.html
index 46ef8db..b0de0dd 100644
--- a/content/get-involved.html
+++ b/content/get-involved.html
@@ -248,7 +248,7 @@
 
         <div class="row">
             <div class="col-lg-12">
-                <p class="footer-copyright">Copyright &copy; 2016 The Apache Software Foundation, Licensed under the <a
+                <p class="footer-copyright">Copyright &copy; 2021 The Apache Software Foundation, Licensed under the <a
                         class="white-text" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
                 </p>
                 <p class="footer-copyright">Apache Airavata, Airavata, Apache, Apache Airavata Logo and the Apache
diff --git a/content/gsoc.html b/content/gsoc.html
index 4c1d878..8b869bb 100644
--- a/content/gsoc.html
+++ b/content/gsoc.html
@@ -162,7 +162,7 @@
 
         <div class="row">
             <div class="col-lg-12">
-                <p class="footer-copyright">Copyright &copy; 2016 The Apache Software Foundation, Licensed under the <a
+                <p class="footer-copyright">Copyright &copy; 2021 The Apache Software Foundation, Licensed under the <a
                         class="white-text" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
                 </p>
                 <p class="footer-copyright">Apache Airavata, Airavata, Apache, Apache Airavata Logo and the Apache
diff --git a/content/index.html b/content/index.html
index 8c1a5b2..99f8afc 100644
--- a/content/index.html
+++ b/content/index.html
@@ -392,7 +392,7 @@
 
         <div class="row">
             <div class="col-lg-12">
-                <p class="footer-copyright">Copyright &copy; 2016 The Apache Software Foundation, Licensed under the <a
+                <p class="footer-copyright">Copyright &copy; 2021 The Apache Software Foundation, Licensed under the <a
                         class="white-text" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
                 </p>
                 <p class="footer-copyright">Apache Airavata, Airavata, Apache, Apache Airavata Logo and the Apache
diff --git a/content/lazy-consensus.html b/content/lazy-consensus.html
index d7881a3..9004b0f 100644
--- a/content/lazy-consensus.html
+++ b/content/lazy-consensus.html
@@ -175,7 +175,7 @@
 
         <div class="row">
             <div class="col-lg-12">
-                <p class="footer-copyright">Copyright &copy; 2016 The Apache Software Foundation, Licensed under the <a
+                <p class="footer-copyright">Copyright &copy; 2021 The Apache Software Foundation, Licensed under the <a
                         class="white-text" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
                 </p>
                 <p class="footer-copyright">Apache Airavata, Airavata, Apache, Apache Airavata Logo and the Apache
diff --git a/content/learning.html b/content/learning.html
index d54d487..f9de941 100644
--- a/content/learning.html
+++ b/content/learning.html
@@ -245,7 +245,7 @@
 
         <div class="row">
             <div class="col-lg-12">
-                <p class="footer-copyright">Copyright &copy; 2016 The Apache Software Foundation, Licensed under the <a
+                <p class="footer-copyright">Copyright &copy; 2021 The Apache Software Foundation, Licensed under the <a
                         class="white-text" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
                 </p>
                 <p class="footer-copyright">Apache Airavata, Airavata, Apache, Apache Airavata Logo and the Apache
diff --git a/content/logo.html b/content/logo.html
index 84f2116..1f2045b 100644
--- a/content/logo.html
+++ b/content/logo.html
@@ -203,7 +203,7 @@
 
         <div class="row">
             <div class="col-lg-12">
-                <p class="footer-copyright">Copyright &copy; 2016 The Apache Software Foundation, Licensed under the <a
+                <p class="footer-copyright">Copyright &copy; 2021 The Apache Software Foundation, Licensed under the <a
                         class="white-text" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
                 </p>
                 <p class="footer-copyright">Apache Airavata, Airavata, Apache, Apache Airavata Logo and the Apache
diff --git a/content/mailing-list.html b/content/mailing-list.html
index b71f8e7..1bd0891 100644
--- a/content/mailing-list.html
+++ b/content/mailing-list.html
@@ -278,7 +278,7 @@
 
         <div class="row">
             <div class="col-lg-12">
-                <p class="footer-copyright">Copyright &copy; 2016 The Apache Software Foundation, Licensed under the <a
+                <p class="footer-copyright">Copyright &copy; 2021 The Apache Software Foundation, Licensed under the <a
                         class="white-text" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
                 </p>
                 <p class="footer-copyright">Apache Airavata, Airavata, Apache, Apache Airavata Logo and the Apache
diff --git a/content/submit-patch.html b/content/submit-patch.html
index df7e900..2945156 100644
--- a/content/submit-patch.html
+++ b/content/submit-patch.html
@@ -149,7 +149,7 @@
 
         <div class="row">
             <div class="col-lg-12">
-                <p class="footer-copyright">Copyright &copy; 2016 The Apache Software Foundation, Licensed under the <a
+                <p class="footer-copyright">Copyright &copy; 2021 The Apache Software Foundation, Licensed under the <a
                         class="white-text" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
                 </p>
                 <p class="footer-copyright">Apache Airavata, Airavata, Apache, Apache Airavata Logo and the Apache
diff --git a/source/_data/team.yml b/source/_data/team.yml
index f9e9b52..dc9501c 100644
--- a/source/_data/team.yml
+++ b/source/_data/team.yml
@@ -21,9 +21,9 @@
 - name: Aarushi Bisht
   apache_id: aarushi
   email: aarushi [at] apache [dot] org
-  organization: Indiana University
+  organization: Unity Technologies
   roles: committer
-  time_zone: "-5"
+  time_zone: "-8"
 
 - name: Ajinkya Dhamnaskar
   apache_id: adhamnas
@@ -56,7 +56,7 @@
 - name: Ate Douma
   apache_id: ate
   email: ate [at] apache [dot] org
-  organization: Hippo
+  organization: Bloomreach
   roles: committer, PMC, Incubation Mentor
   time_zone: "+1"
 
@@ -315,7 +315,7 @@
 - name: Viknes Balasubramanee
   apache_id: viknesb
   email: viknesb [at] apache [dot] org
-  organization: Interana
+  organization: Twitter
   roles: committer
   time_zone: "-8"
 
diff --git a/source/_includes/footer.html b/source/_includes/footer.html
index 37e7950..83cb1b9 100644
--- a/source/_includes/footer.html
+++ b/source/_includes/footer.html
@@ -50,7 +50,7 @@
 
         <div class="row">
             <div class="col-lg-12">
-                <p class="footer-copyright">Copyright &copy; 2016 The Apache Software Foundation, Licensed under the <a
+                <p class="footer-copyright">Copyright &copy; 2021 The Apache Software Foundation, Licensed under the <a
                         class="white-text" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
                 </p>
                 <p class="footer-copyright">Apache Airavata, Airavata, Apache, Apache Airavata Logo and the Apache
diff --git a/source/api-docs/.DS_Store b/source/api-docs/.DS_Store
new file mode 100644
index 0000000..983ed6b
--- /dev/null
+++ b/source/api-docs/.DS_Store
Binary files differ
diff --git a/source/development.md b/source/development.md
index 2488de6..7f600b7 100644
--- a/source/development.md
+++ b/source/development.md
@@ -144,7 +144,7 @@
                         </ol>
 
                         <h3>Airavata Web Site</h3>
-                        <p>The Apache Airavata website is availalbe from Apache's Git repository and mirrored in
+                        <p>The Apache Airavata website is available from Apache's Git repository and mirrored in
                             GitHub.</p>
                         <ol>
                             <li>