add ability to define ocean colour block via ruleset

this will come in handy for TFTD
brace yourself.
layout & .cbp
BaseInfoState: align numTexts

Camera: adjust isOnScreen()
Map: keep rankIcon above ceiling

Merge branch 'master' of https://github.com/SupSuper/OpenXcom into oXc_kL
Conflicts:
	src/Geoscape/Globe.cpp
	src/Geoscape/Globe.h