settings, public dirs
Merge branch 'develop' of github.com:VoIPGRID/civili into develop