cleanup
Merge branch '1.2' of ssh://jreimann@gerrit.intra:29418/org.openscada.atlantis into 1.2