Moved highway entries from priority to speed
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