Correct AIS target list and query display for named base stations (FS#1359)
Correct possible fault on poorly encoded S57 ENCs
Merge branch 'master' of https://github.com/OpenCPN/OpenCPN into mainline

Conflicts:
	src/AISTargetListDialog.cpp
	src/AIS_Target_Data.cpp
	src/OCPNListCtrl.cpp
	src/s52plib.cpp
	src/s57chart.cpp