Merge branch 'master' into group3/master
Merge branch 'master' into group4/master
Merge branch 'master' into group5/master
Merge branch 'master' into group7/master
Merge branch 'master' into group8/master
Merge branch 'master' of https://github.com/maxfindel/gameworks into group6/master