Issue #490 not finished
Merge remote-tracking branch 'upstream/development' into development
To issues #446, #493 for countries
To issues #446, #493 for countries with unit tests fixed
To issues #446, #493 for countries are done, CountryControllerTest is updated
Merge pull request #495 from AnnaStorozhenko/development

To issues #446, #493 (not finished)