Solve conflicts
Merge branch 'master' into dev

Conflicts:
data/conf/bind9/named.conf
data/web/modals/footer.php
docker-compose.yml