Merge branch 'next' of https://github.com/sgrenier/GamePlay into next

Conflicts:
	samples/browser/res/common/arial.gpb
	samples/browser/res/common/default.theme
	samples/browser/src/FormsSample.cpp
	samples/browser/src/SamplesGame.cpp