Updated setup
Merge branch 'dev' of github.com:foxdog-studios/citysdk-api into dev