Adicionando a cidade e o estado no endereco.
Adicionando informacoes locais e do server no cloudbess
Merge branch 'master' of https://github.com/vsnepomuceno/soservices

Conflicts:
	sos-service/src/main/java/com/sos/service/business/GoogleMapsServiceImpl.java
	sos-service/src/main/resources/db.properties