Merge branch 'dev' of https://dev.quiqqer.com/quiqqer/quiqqer into dev