merged master - integrated project
Work 20.01.2014
changed und so
changed und so
letzts uznd so (und)
integrated program, working Options, other small changes