bugfix
popdo
...
Merge branch 'master' of github.com:philippK-de/Collabtive into smarty3