Merge branch 'dev' into dta/overview
diff --git a/asf-site-build.sh b/asf-site-build.sh
new file mode 100755
index 0000000..326fac3
--- /dev/null
+++ b/asf-site-build.sh
@@ -0,0 +1,35 @@
+BRANCH=$(git branch | grep '^*' | sed 's/* //' )
+if [[ $BRANCH == "master" ]]; then
+  location=$PWD # get current dir
+  printf "\nThe current directory is %s\n" $location # print current dir
+  cd website # change to website dir
+  printf "\nThis directory should end in ../website: %s\n" $PWD # echo website directory just to be safe
+  printf "\nThe script is going to build the website now, this make take a few minutes.\n"
+  npm run build # build website
+  # for i in ./*; do
+  #   echo $i
+  # done
+  printf "\nThe script will make a temporary directory at /tmp/asf-site-prep/\n" $USER # describe action
+  mkdir /tmp/asf-site-prep/ # making temp director
+  printf "\nThe script will move the contents of the /build directory to /tmp/asf-site-prep/\n" # describe action
+  mv ./build/* /tmp/asf-site-prep/ # copy contents of directory
+  printf "\nThe script will make a temporary directory at /tmp/asf-site/ and will clone the asf-site branch into it.\n" # describe action
+  mkdir /tmp/asf-site # make directory
+  cd /tmp/asf-site # switch directory
+  git clone -b asf-site --single-branch https://github.com/apache/incubator-milagro # cloning website
+  cd incubator-milagro # into directory
+  printf "\nThe script will push the new asf-site branch and begin cleanup.\n\n" # describe action
+  git rm -r *
+  git commit -m "removing asf-site files"
+  cp -R /tmp/asf-site-prep/incubator-milagro\ /* /tmp/asf-site/incubator-milagro/
+  git add .
+  git commit -m "new asf-site"
+  git push origin asf-site
+  cd $location 
+  printf "\nRemoving the /tmp directories.\n\n" # describe action
+  rm -rf /tmp/asf-site-prep
+  rm -rf /tmp/asf-site
+  printf "\nAll done!\n" # describe action
+elif [[ $BRANCH != "master" ]]; then
+  printf "\nThis script must be run off the master branch.\n"
+fi
diff --git a/doap_Milagro.rdf b/doap_Milagro.rdf
index 15b6e6d..1a54ca5 100644
--- a/doap_Milagro.rdf
+++ b/doap_Milagro.rdf
@@ -30,11 +30,11 @@
     <shortdesc>Core security infrastructure for decentralized networks.</shortdesc>
     <description>Milagro is crypto libraries and core security infrastructure for decentralized networks and distributed systems.</description>
     <bug-database rdf:resource="https://issues.apache.org/jira/browse/MILAGRO" />
-    <mailing-list rdf:resource="http://milagro.incubator.apache.org/" />
+    <mailing-list rdf:resource="https://lists.apache.org/list.html?dev@milagro.apache.org" />
     <download-page rdf:resource="http://milagro.incubator.apache.org/" />
     <programming-language>Python</programming-language>
     <programming-language>Go</programming-language>
-    <programming-language>Javascript</programming-language>
+    <programming-language>JavaScript</programming-language>
     <programming-language>C</programming-language>
     <category rdf:resource="http://projects.apache.org/category/cloud" />
   </Project>