code before execution
Merge branch 'develop' of github.com:YuichiTK/Farm-City into develop
Fixed layout problem
translations
resolved conflicts :)
Style for places
Refolved conflict
Style to images
Resoled conflicts