add config
basic data
update config files
gitignore put .idea
Changed config
Merge with origin/develop
Fixed api_manager config issue
Added City entity to User entity
update composer
update composer
update composer
update models
Fixed user hydrate method
Merge branch 'develop'