Allows ckfinder config to be overwritten.
Updated Version 3.1.29.108
Merge branch 'develop' into develop-eventandbundle

Conflicts:
	version.txt
Fixes bugs when Railo/memCache are used as the external caching
provider.  Also improves caching performance.
Updated Version 3.1.29.109
Adds setting for IP Addresses that should be ignored by session tracking
Merge branch 'develop' into local-fix
Updated Version 3.1.29.110
fix for issue #2040
bug caused by typo reemerged in CommentDAO, changed all "hqlPrarms" to
"hqlParams"
Updated Version 3.1.30
Merge branch 'master' into develop

Conflicts:
	version.txt
Updates to not set cookie if it already exists
Merge branch 'develop' into local-fix
Updated Version 3.1.30.111
Fixes bugs with integration setting meta data not loading up correctly.
Updated Version 3.1.30.112
Fixes issue of CurrencyCode not being assigned during subscription
renewal
Updated Version 3.1.31
Merge branch 'master' into develop

Conflicts:
	version.txt