Merge remote-tracking branch 'origin/suporteUsuariosCidades'

Conflicts:
	ApoioTerritorioLS/war/WEB-INF/lib/appengine-api-1.0-sdk-1.8.0.jar
	ApoioTerritorioLS/war/WEB-INF/lib/appengine-api-labs.jar
	ApoioTerritorioLS/war/WEB-INF/lib/appengine-endpoints.jar