ModManager stuff
Bugfixes, ModManager and pushed a new version
Merge branch 'dev-jens' into dev