bugfixes
Merge branch 'master' of github.com:octris/org.octris.tmbundle