added position and radius to user
Merge branch 'develop' of github.com:YuichiTK/Farm-City into develop
languages
resolved conficts