Fixed the terrain sample.
Merge branch 'next' of https://github.com/blackberry/GamePlay into next

Conflicts:
	samples/browser/src/TerrainSample.cpp
Merge pull request #1225 from seanpaultaylor/next

Next