Stoiss code edits
Merge branch 'master' of http://github.com/eezstreet/JediKnightGalaxies
Merge branch 'master' of http://github.com/eezstreet/JediKnightGalaxies
Merge branch 'master' of http://github.com/Stoiss/JediKnightGalaxies