Merge pull request #21 from lararennie/master

Rearranging Ecuador postal codes.
Merge pull request #22 from lararennie/master

Fixing Java unit-test that fails now that the server data has been updated.
Calling the sublocality field name calculation function to set up the UI.
Merge remote-tracking branch 'upstream/master'
First go at fixing labels (Java) and changing error messages API.
Changing neighbourhood to US spelling in new message.
Fixing street address 1 string.
Adding sublocality_name_type and locality_name_type handling.

Involves new strings for translations, plus the logic to return those
strings. Implemented in Java and C++.

Tested: unit-tests in C++. Unit-tests in Java don't exist for the main
UI class, but I tested it built.
Delete trailing whitespace.
Resolved conflicts; accepted upstream.
Resolving changes to master