Merge pull request #143 from gratzc/development

Added cacheObjectKey to intercept data for afterCacheElementUpdated

CACHEBOX-6 #close
COLDBOX-178 #close
New Testing Decorator: ORMTransactionRollback that will automatically transaction and rollback your test methods using ColdBox ORM Services
COLDBOX-179 #close
Integration testing execute() method now can render the results of the request by passing *renderResults=true* as an argument. This will create a cbox_rendered_content variable in the RC for you to assert the renderings
WIREBOX-8 #close
Binder implicit parentInjector setting is not being read and a parent injector is not being set.
WIREBOX-9 #close
Problem shutting down CacheBox in injectors when it is not linked as it is pointing to ColdBox and not CacheBox
WIREBOX-10 #close
mapDirectory() new argument "influence" which can be a closure or UDF that receives the currently iteration binder and path so you can influence it.
WIREBOX-11 #close
mapDirectory() new argument "filter" that can be a closure or UDF that accepts the incoming path and determines if it is processed or not by returning TRUE to process or FALSE to skip
WIREBOX-12 #close
toProvider( closure/udf ) can now take in a closure or UDF that will produce the dependency
CBOXLITE-5 #close
Bug on location argument with renderdata not being executed
CBOXLITE-6 #close
renderdata with formats and formatsview to allow for auto-format detection
WIREBOX-4
Allow usage of injection DSL in provider definitions
WIREBOX-4
Allow usage of injection DSL in provider definitions
COLDBOX-180 #close
Bug when inflating relationships with population, getRelationalMetadata should not bring back non-relational columns
passed request string to the condition closure COLDBOX-165
MOCKBOX-6 #close
ACF errors when mocking methods named "contains"
WIREBOX-13 #close
Additional binder method and namespace for Java and JavaLoader
small performance update
stupid whitespace
stupid whitespace
updated version #
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