ADAM / AIAHTML5

Step 1. Update the repo and checkout the branch we are going to merge

git fetch origin
git checkout -b AiaAdmin15112017 origin/AiaAdmin15112017

Step 2. Merge the branch and push the changes to GitLab

git checkout Develop-IPAD-MAC
git merge --no-ff AiaAdmin15112017
git push origin Develop-IPAD-MAC