Merge branch 'master' of https://github.com/maxfindel/gameworks into group1/develop
Merge branch 'master' of https://github.com/maxfindel/gameworks into group1/develop
Merge branch 'group1/develop' of https://github.com/maxfindel/gameworks into group1/develop
List with objects added to map edition frame