ADAM / AIAHTML5

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

git fetch origin
git checkout -b master origin/master

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

git checkout AIA_Develop
git merge --no-ff master
git push origin AIA_Develop