Gather some data about the heightmaps, and pre-convert them doubles instead of doing it every single bloody time they're used.
Merge branch 'master' of https://github.com/pioneerspacesim/pioneer into UnifyHMaps
Merge branch 'master' of https://github.com/pioneerspacesim/pioneer into UnifyHMaps
This is a noisey commit due to a few const changes.
The actual meat of it is a new TerrainColorEarthLikeHeightmapped.cpp file which splits the heightmap using branches out of TerrainColorEarthLike.cpp and simplifies them both in due course.
Also TerrainColorTFPoor.cpp no longer has the heightmap branches since IT NEVER USED THEM.
Assert and const again.
Assert bounds check and if null checking.
Merge branch 'master' of https://github.com/pioneerspacesim/pioneer into UnifyHMaps

Conflicts:
	src/TerrainBody.cpp
Embed Scroller of SmartTable in ui:Expand to make it work again.
Merge branch 'master' of https://github.com/pioneerspacesim/pioneer into UnifyHMaps

Conflicts:
	src/terrain/Terrain.h
	src/terrain/TerrainNoise.h
	win32/vc2012/terrain/terrain.vcxproj
	win32/vc2012/terrain/terrain.vcxproj.filters
Update Czech translation

* some linguistic/grammary changes, to better fit in Czech mouth
do float/fixed comparison properly. savefile break :(
Scaled down the Wave to .075th size. It makes more sense this way. Added pattern support too.
Adding Barnard as new start
Merge remote-tracking branch 'jmf/prison_start'
Merge remote-tracking branch 'valinbsd/czech_lang'
Merge remote-tracking branch 'nozmajner/wave_scale'
new ship: amphiesma
Merge branch 'amphiesma'
fix tab in changelog
move amphiesma model under ships/ where it belongs (thanks walterar!)