Merge branch 'master' of https://github.com/gwaldron/osgearth
SingleThreaded Qt
Merge branch 'master' of git://github.com/gwaldron/osgearth

Conflicts:
	src/osgEarthQt/MultiViewerWidget
	src/osgEarthQt/MultiViewerWidget.cpp
	tests/feature_geom.earth
quadtile testing
MP: quad tile batching
Adjust the boston example
merge quadtile
Version bump and merge finish
Enable incremental update with refactored paged lod system in MP
Merge branch 'master' of github.com:gwaldron/osgearth
version bump, 2.5rc3
Fix #414 Bad intersection in Terrain::getCoords.. and in the CullingUtils occlusion culler
Update faq.rst
Merge pull request #415 from remoe/patch-5

Update faq.rst
MP: optimization to prevent overdraw when there are fully opaque tile layers
Merge branch 'master' of github.com:gwaldron/osgearth
Fix: disable MP layer optimization when color filters are installed
MP: slight perf tweak
Fix: memory leak in OverlayNode destruction
Fix: MP, forgot to check IMageLayer.getVisible when resolving bottom-most layer to render