bugfixing
Merge branch 'dev' of bitbucket.org:webtischlerei/moraso-cms