Post-merge cleanup
Move ModelMatcher to ui/map/
Remove obsolete files
Merge branch 'misc/qt5' into ports/android

Conflicts:
	source/ui/map/modelmatcher.cpp
	source/ui/map/modelmatcher.h