Huge update batch. Fixed lots of stuff
Merge branch 'master' of ssh://git@github.com/Gruppe21/exph0001.git