Fixed Formatting
Wacky formatting merge with branch 'master' of https://github.com/garrynewman/GWEN

Conflicts:
	gwen/src/Controls/PageControl.cpp
	gwen/src/Gwen.cpp
	gwen/src/Platforms/Windows.cpp