Merge branch 'master' into DeveloperBranch
Merge branch 'DeveloperBranch' of https://github.com/DAT255-GLPP/PalPointerApp into DeveloperBranch