App structure
Merge branch 'develop' of github.com:simbiotica/open-spaces-city into develop