[MOCDTW-431] Included Country and City as first-class citizens in Place
Merge branch 'master' of https://github.com/evrythng/evrythng-tools
Adding Places to Search Service Results
Merge branch 'master' of https://github.com/evrythng/evrythng-tools

Conflicts:
	thng-resource-model/src/main/java/com/evrythng/thng/resource/model/store/Place.java