Rebase the master branch (git instructions)

cd notey-web git checkout mobileWeb git pull git checkout i18n_mobileWeb git rebase mobileWeb // To resolve any merge conflict git add main/webapp/js/poca/component/page/FrontPage.js git rebase --continue git status git stash pop git push -f