fix compilation when !defined(USE_UNSYNCED_HEIGHTMAP)
marginally clean up the ReadMap.h interface (no more branching or ifdef'ed accessors)
leave SM3 in a slightly less broken state for whoever wants to mess with it in the future (fix #3942)
Merge branch 'develop' of github.com:spring/spring into develop