Correct AIS Rollover window logic for close targets onscreen (FS#1175)
Merge branch 'master' of https://github.com/OpenCPN/OpenCPN
Merge branch 'master' into refactoring

Conflicts:
	include/chcanv.h
	src/chcanv.cpp