stupid whitespace
Merge branch 'development'

Conflicts:
	ApplicationTemplates/lite/handlers/Main.cfc
	ApplicationTemplates/lite/includes/error.cfm
	system/plugins/IOC.cfc
	system/plugins/MessageBox.cfc
	system/plugins/QueryHelper.cfc
	system/testing/mockutils/MockGenerator.cfc
	system/web/services/BaseService.cfc
	testharness/handlers/Render.cfc
	testing/cases/interceptors/securityTest.cfc
	testing/cases/ioc/BuilderTest.cfc
	testing/cases/ioc/InjectorCreationTest.cfc
	testing/cases/ioc/InjectorTest.cfc
	testing/cases/ioc/ProviderTest.cfc
	testing/cases/ioc/config/BinderTest.cfc
	testing/cases/ioc/config/samples/InjectorCreationTestsBinder.cfc
	testing/cases/plugins/HTMLHelperTest.cfc
	testing/cases/testing/BaseTestCaseTest.cfc
	testing/cases/testing/Test.cfc