Generic fixes
Merge branch 'master' of github.com:AldebaranEntertainments/Game
Temp fix
Merge fix
Massive Refactor