code before execution
Merge branch 'develop' of github.com:YuichiTK/Farm-City into develop
translations
resolved conflicts :)