MapTest changes
Merge branch 'group5/develop' of https://github.com/maxfindel/gameworks into group5/develop