#GT-972: fixed unit tests
Merge branch 'devel' of github.com:geo2tag/core into devel