Ommit empty hyperlink mime type while creating GPX file
Merge branch 'master' of https://github.com/OpenCPN/OpenCPN into mainline

Conflicts:
	src/NavObjectCollection.cpp