merging svn to master branch
merging svn to master branch

Merge branch 'master' into HEAD


git-svn-id: 44110302500ff4d6168e3867631ad1bb4eb9722b@11445 6cd15df7-5b2d-4548-a7df-5dcce267a22b

tensorics/tensorics-core