integrated program, working Options, other small changes
Stuff done 24.01
finished for it3
After iteration 3
30.01.2014
Merge remote-tracking branch 'origin/master' into koerbler
aDSF