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

Conflicts:
	src/osgEarthQt/MultiViewerWidget
	src/osgEarthQt/MultiViewerWidget.cpp
	tests/feature_geom.earth
Added option to set touch sensitivity
Typo in last commit
Type
Add to last commit
Merge branch 'master' of https://github.com/gwaldron/osgearth

Conflicts:
	src/osgEarthDrivers/ocean_triton/TritonNode
	src/osgEarthQt/MultiViewerWidget.cpp
Typo
First try to merge with setHeightMap for Triton ocean.
Trying to fix triton
Starting to add planar reflection to triton
Fixed silverlining and triton combination while passing the Earth's heightmap to triton
Deleted unnecessary file
Cleanup
Merge pull request #531 from rooi/master

Added heightmap to triton ocean