Moved highway entries from priority to speed
UniRS: add shield to natural=spring icon
Change minzoom of water_well from 15 to 16
Merge branch 'master' of https://github.com/osmandapp/OsmAnd-resources
UniRS: clean up
Swap aerodrome and airport icons
Remove zebra from highway crossing icon
UniRS: Rise minzoom for footways in pedestrian and bicycle mode. There was too much clutter.
Changed back order
Changed speeds and added a couple of entries to priorities
Merge remote-tracking branch 'upstream/master'

Conflicts:
	routing/routing.xml
resolved conflicts
Merge pull request #198 from boeleman/master

Moved highway entries from priority to speed
Tweak routing parameters to use more motorways
Merge branch 'master' of github.com:osmandapp/OsmAnd-resources