some platform changes
Merge branch 'master' of https://github.com/snewsom/UltraBrawl