Added and fixed stuff;
Merge branch 'master' of https://github.com/RochauD/JGameHack