delete vivilox folder from root
Merge branch 'develop' of github.com:RobertUJ/vivilox_server into develop

merge
update local settings.py