Add more time measures on TestRouting.
Simplify loadTileData based on new native code.
Always NORMAL route calculation. Never use basemap.
Update SherlockBar build system.
More git ignored files.
Update native build config.
More ignored files.
Add an enum for addr:place for OsmAndMapCreator to use.

addr:place=* support is very important for address search in some
countries.  Nominatim and most other tools support it.
(cherry picked from commit 4b516efde962ac77d526f46f4e020f52cbc279e4)
Add CityType.NEIGHBOURHOOD for OsmAndMapCreator.

place=neighbourhood is gaining popularity for about two years in OSM
tagging and is supported by other tools as a subdivision of a
place=suburb and similar.
(cherry picked from commit 9d2cbe0d171f4df707b6c009e93404c463ae6bce)
FOR MAPCREATOR
Embed fonts into build
(cherry picked from commit 658de3c7100fdadfcf1405d70cd74da8107f1390)
FOR MAPCREATOR
Update rendering types
(cherry picked from commit 87d910e7b748b6e3d22f216a942fe81fab26a234)

Conflicts:

	OsmAnd-java/src/net/osmand/binary/BinaryInspector.java
FOR MAPCREATOR
Add support for custom fonts
(cherry picked from commit f31cebf6a76b46df1656de8a32a5695fad399ddc)
FOR MAPCREATOR
Update constants
(cherry picked from commit 4d00c93c5580a9c0d26836609ad194be90dbc866)
FOR MAPCREATOR
Prepare english name maps
(cherry picked from commit 46adfea1c193d85cb98e4591d31ad308cc924582)
TO SUPPORT NEW ROUTING PARAMETERS
WAS: New experimental routing
(cherry picked from commit 2eca9ec77f21c08db6e08526876780c6fd1473eb)
Remove checkOldRoutingFiles.