integrating scenes again + many minor fixes
Merge branch 'master' of https://github.com/Winded/GravityDeathmatch