bugfixes
Merge branch 'master' of http://github.com/ATLASsoft/SoPra.git