Merge pull request #8 from oerpli/master

fixed loading non challenge savegames and another crash
Some fixes and change rendering method.
Merge remote-tracking branch 'upstream/master'