Merge branch 'develop'

Conflicts:
	railo-java/railo-core/src/railo/runtime/Info.ini
	railo-java/railo-core/src/resource/context/railo-context.ra
track them
rollback to 3.1.2.002
Merge branch '3.2'
Merge branch '3.2'
Merge branch '3.2'
Merge branch '3.2'
Merge branch '3.2'
Merge branch '3.2'
add debug project
Merge branch '3.2'
added railo-debug/bin to gitignore
removed unnecessary stuff
Merge branch '3.2'
Merge branch '3.2'
Merge branch '3.2'
Merge branch '3.2'
Merge commit 'e8f351ac64088b31f54537559a438abb06714af1'

Conflicts:
	railo-cfml/railo-admin/admin/plugin.cfm
	railo-cfml/railo-admin/admin/web.cfm
	railo-java/railo-core/.classpath
	railo-java/railo-core/src/railo/commons/io/SystemUtil.java
	railo-java/railo-core/src/railo/runtime/CFMLFactoryImpl.java
	railo-java/railo-core/src/railo/runtime/Info.ini
	railo-java/railo-core/src/railo/runtime/PageContextImpl.java
	railo-java/railo-core/src/railo/runtime/config/ConfigImpl.java
	railo-java/railo-core/src/railo/runtime/config/ConfigServerFactory.java
	railo-java/railo-core/src/railo/runtime/config/ConfigServerImpl.java
	railo-java/railo-core/src/railo/runtime/config/ConfigWebFactory.java
	railo-java/railo-core/src/railo/runtime/config/ConfigWebImpl.java
	railo-java/railo-core/src/railo/runtime/db/DatasourceConnectionPool.java
	railo-java/railo-core/src/railo/runtime/db/SQLCaster.java
	railo-java/railo-core/src/railo/runtime/functions/decision/IsValid.java
	railo-java/railo-core/src/railo/runtime/functions/displayFormatting/HTMLEditFormat.java
	railo-java/railo-core/src/railo/runtime/functions/image/ImageFilter.java
	railo-java/railo-core/src/railo/runtime/img/Image.java
	railo-java/railo-core/src/railo/runtime/img/filter/ApplyMaskFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/AverageFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/BicubicScaleFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/BinaryFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/BlockFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/BlurFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/BorderFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/BoxBlurFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/BrushedMetalFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/BumpFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/CausticsFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/CellularFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ChannelMixFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/CheckFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ChromaKeyFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ChromeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/CircleFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/CompositeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/CompoundFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ContourFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ContrastFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ConvolveFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/CropFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/CrystallizeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/CurlFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/CurvesFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/DespeckleFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/DiffuseFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/DiffusionFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/DilateFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/DisplaceFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/DissolveFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/DitherFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/DynFiltering.java
	railo-java/railo-core/src/railo/runtime/img/filter/EdgeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/EmbossFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/EqualizeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ErodeAlphaFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ErodeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ExposureFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/FBMFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/FadeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/FeedbackFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/FieldWarpFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/FillFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/FlareFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/FlipFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/Flush3DFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/FourColorFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/GainFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/GammaFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/GaussianFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/GlintFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/GlowFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/GradientFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/GradientWipeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/GrayFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/GrayscaleFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/HSBAdjustFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/HalftoneFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ImageCombiningFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ImageFilterUtil.java
	railo-java/railo-core/src/railo/runtime/img/filter/InterpolateFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/InvertAlphaFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/InvertFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/IteratedFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/JavaLnFFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/KaleidoscopeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/KeyFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/LensBlurFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/LevelsFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/LifeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/LightFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/LookupFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/MapColorsFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/MapFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/MarbleFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/MarbleTexFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/MaskFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/MaximumFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/MedianFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/MinimumFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/MirrorFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/MotionBlurFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/MutatableFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/NoiseFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/OffsetFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/OilFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/OpacityFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/OutlineFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/PerspectiveFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/PinchFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/PlasmaFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/PointFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/PointillizeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/PolarFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/PosterizeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/PremultiplyFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/QuantizeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/QuiltFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/RGBAdjustFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/RaysFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ReduceNoiseFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/RenderTextFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/RescaleFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/RippleFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/RotateFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/SaturationFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ScaleFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ScratchFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ShadeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ShadowFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ShapeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/SharpenFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ShatterFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ShearFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ShineFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/SkeletonFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/SkyFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/SmartBlurFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/SmearFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/SolarizeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/SparkleFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/SphereFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/StampFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/SwimFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/TextureFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ThresholdFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/TileImageFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/TransferFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/TransformFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/TransitionFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/TwirlFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/UnpremultiplyFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/UnsharpFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/VariableBlurFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/WarpFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/WaterFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/WeaveFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/WholeImageFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/WoodFilter.java
	railo-java/railo-core/src/railo/runtime/listener/AppListenerUtil.java
	railo-java/railo-core/src/railo/runtime/listener/ClassicApplicationContext.java
	railo-java/railo-core/src/railo/runtime/listener/ModernAppListener.java
	railo-java/railo-core/src/railo/runtime/op/Caster.java
	railo-java/railo-core/src/railo/runtime/reflection/Reflector.java
	railo-java/railo-core/src/railo/runtime/tag/Application.java
	railo-java/railo-core/src/railo/runtime/tag/FileTag.java
	railo-java/railo-core/src/railo/runtime/type/scope/ClientCookie.java
	railo-java/railo-core/src/railo/runtime/type/scope/ClientCookieOld.java
	railo-java/railo-core/src/railo/runtime/type/scope/ClientCookieSimple.java
	railo-java/railo-core/src/railo/runtime/type/scope/ClientDatasource.java
	railo-java/railo-core/src/railo/runtime/type/scope/ClientFile.java
	railo-java/railo-core/src/railo/runtime/type/scope/ClientMemory.java
	railo-java/railo-core/src/railo/runtime/type/scope/ClientPlus.java
	railo-java/railo-core/src/railo/runtime/type/scope/ScopeContext.java
	railo-java/railo-core/src/railo/runtime/type/scope/storage/StorageScopeImpl.java
	railo-java/railo-core/src/railo/runtime/util/ApplicationContextPro.java
	railo-java/railo-core/src/railo/transformer/bytecode/expression/var/Assign.java
	railo-java/railo-core/src/railo/transformer/bytecode/statement/java/Assign.java
	railo-java/railo-core/src/railo/transformer/cfml/evaluator/impl/Script.java
	railo-java/railo-core/src/railo/transformer/cfml/expression/CFMLExprTransformer.java
	railo-java/railo-core/src/railo/transformer/cfml/script/JavaScriptTransformer.java
	railo-java/railo-core/src/railo/transformer/cfml/tag/CFMLTransformer.java
	railo-java/railo-core/src/railo/transformer/util/CFMLString.java
	railo-java/railo-core/src/resource/context/railo-context.ra
	railo-java/railo-core/src/resource/fld/web-cfmfunctionlibrary_1_0
	railo-java/railo-core/src/resource/tld/web-cfmtaglibrary_1_0
	railo-java/railo-loader/src/railo/runtime/type/Scope.java
Merge commit 'e8f351ac64088b31f54537559a438abb06714af1'

Conflicts:
	railo-cfml/railo-admin/admin/plugin.cfm
	railo-cfml/railo-admin/admin/web.cfm
	railo-java/railo-core/.classpath
	railo-java/railo-core/src/railo/commons/io/SystemUtil.java
	railo-java/railo-core/src/railo/runtime/CFMLFactoryImpl.java
	railo-java/railo-core/src/railo/runtime/Info.ini
	railo-java/railo-core/src/railo/runtime/PageContextImpl.java
	railo-java/railo-core/src/railo/runtime/config/ConfigImpl.java
	railo-java/railo-core/src/railo/runtime/config/ConfigServerFactory.java
	railo-java/railo-core/src/railo/runtime/config/ConfigServerImpl.java
	railo-java/railo-core/src/railo/runtime/config/ConfigWebFactory.java
	railo-java/railo-core/src/railo/runtime/config/ConfigWebImpl.java
	railo-java/railo-core/src/railo/runtime/db/DatasourceConnectionPool.java
	railo-java/railo-core/src/railo/runtime/db/SQLCaster.java
	railo-java/railo-core/src/railo/runtime/functions/decision/IsValid.java
	railo-java/railo-core/src/railo/runtime/functions/displayFormatting/HTMLEditFormat.java
	railo-java/railo-core/src/railo/runtime/functions/image/ImageFilter.java
	railo-java/railo-core/src/railo/runtime/img/Image.java
	railo-java/railo-core/src/railo/runtime/img/filter/ApplyMaskFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/AverageFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/BicubicScaleFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/BinaryFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/BlockFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/BlurFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/BorderFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/BoxBlurFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/BrushedMetalFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/BumpFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/CausticsFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/CellularFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ChannelMixFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/CheckFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ChromaKeyFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ChromeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/CircleFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/CompositeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/CompoundFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ContourFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ContrastFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ConvolveFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/CropFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/CrystallizeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/CurlFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/CurvesFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/DespeckleFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/DiffuseFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/DiffusionFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/DilateFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/DisplaceFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/DissolveFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/DitherFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/DynFiltering.java
	railo-java/railo-core/src/railo/runtime/img/filter/EdgeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/EmbossFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/EqualizeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ErodeAlphaFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ErodeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ExposureFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/FBMFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/FadeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/FeedbackFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/FieldWarpFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/FillFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/FlareFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/FlipFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/Flush3DFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/FourColorFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/GainFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/GammaFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/GaussianFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/GlintFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/GlowFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/GradientFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/GradientWipeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/GrayFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/GrayscaleFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/HSBAdjustFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/HalftoneFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ImageCombiningFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ImageFilterUtil.java
	railo-java/railo-core/src/railo/runtime/img/filter/InterpolateFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/InvertAlphaFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/InvertFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/IteratedFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/JavaLnFFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/KaleidoscopeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/KeyFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/LensBlurFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/LevelsFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/LifeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/LightFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/LookupFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/MapColorsFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/MapFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/MarbleFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/MarbleTexFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/MaskFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/MaximumFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/MedianFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/MinimumFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/MirrorFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/MotionBlurFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/MutatableFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/NoiseFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/OffsetFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/OilFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/OpacityFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/OutlineFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/PerspectiveFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/PinchFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/PlasmaFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/PointFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/PointillizeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/PolarFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/PosterizeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/PremultiplyFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/QuantizeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/QuiltFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/RGBAdjustFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/RaysFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ReduceNoiseFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/RenderTextFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/RescaleFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/RippleFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/RotateFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/SaturationFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ScaleFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ScratchFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ShadeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ShadowFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ShapeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/SharpenFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ShatterFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ShearFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ShineFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/SkeletonFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/SkyFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/SmartBlurFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/SmearFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/SolarizeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/SparkleFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/SphereFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/StampFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/SwimFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/TextureFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ThresholdFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/TileImageFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/TransferFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/TransformFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/TransitionFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/TwirlFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/UnpremultiplyFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/UnsharpFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/VariableBlurFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/WarpFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/WaterFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/WeaveFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/WholeImageFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/WoodFilter.java
	railo-java/railo-core/src/railo/runtime/listener/AppListenerUtil.java
	railo-java/railo-core/src/railo/runtime/listener/ClassicApplicationContext.java
	railo-java/railo-core/src/railo/runtime/listener/ModernAppListener.java
	railo-java/railo-core/src/railo/runtime/op/Caster.java
	railo-java/railo-core/src/railo/runtime/reflection/Reflector.java
	railo-java/railo-core/src/railo/runtime/tag/Application.java
	railo-java/railo-core/src/railo/runtime/tag/FileTag.java
	railo-java/railo-core/src/railo/runtime/type/scope/ClientCookie.java
	railo-java/railo-core/src/railo/runtime/type/scope/ClientCookieOld.java
	railo-java/railo-core/src/railo/runtime/type/scope/ClientCookieSimple.java
	railo-java/railo-core/src/railo/runtime/type/scope/ClientDatasource.java
	railo-java/railo-core/src/railo/runtime/type/scope/ClientFile.java
	railo-java/railo-core/src/railo/runtime/type/scope/ClientMemory.java
	railo-java/railo-core/src/railo/runtime/type/scope/ClientPlus.java
	railo-java/railo-core/src/railo/runtime/type/scope/ScopeContext.java
	railo-java/railo-core/src/railo/runtime/type/scope/storage/StorageScopeImpl.java
	railo-java/railo-core/src/railo/runtime/util/ApplicationContextPro.java
	railo-java/railo-core/src/railo/transformer/bytecode/expression/var/Assign.java
	railo-java/railo-core/src/railo/transformer/bytecode/statement/java/Assign.java
	railo-java/railo-core/src/railo/transformer/cfml/evaluator/impl/Script.java
	railo-java/railo-core/src/railo/transformer/cfml/expression/CFMLExprTransformer.java
	railo-java/railo-core/src/railo/transformer/cfml/script/JavaScriptTransformer.java
	railo-java/railo-core/src/railo/transformer/cfml/tag/CFMLTransformer.java
	railo-java/railo-core/src/railo/transformer/util/CFMLString.java
	railo-java/railo-core/src/resource/context/railo-context.ra
	railo-java/railo-core/src/resource/fld/web-cfmfunctionlibrary_1_0
	railo-java/railo-core/src/resource/tld/web-cfmtaglibrary_1_0
	railo-java/railo-loader/src/railo/runtime/type/Scope.java
Merge commit 'e8f351ac64088b31f54537559a438abb06714af1'

Conflicts:
	railo-cfml/railo-admin/admin/plugin.cfm
	railo-cfml/railo-admin/admin/web.cfm
	railo-java/railo-core/.classpath
	railo-java/railo-core/src/railo/commons/io/SystemUtil.java
	railo-java/railo-core/src/railo/runtime/CFMLFactoryImpl.java
	railo-java/railo-core/src/railo/runtime/Info.ini
	railo-java/railo-core/src/railo/runtime/PageContextImpl.java
	railo-java/railo-core/src/railo/runtime/config/ConfigImpl.java
	railo-java/railo-core/src/railo/runtime/config/ConfigServerFactory.java
	railo-java/railo-core/src/railo/runtime/config/ConfigServerImpl.java
	railo-java/railo-core/src/railo/runtime/config/ConfigWebFactory.java
	railo-java/railo-core/src/railo/runtime/config/ConfigWebImpl.java
	railo-java/railo-core/src/railo/runtime/db/DatasourceConnectionPool.java
	railo-java/railo-core/src/railo/runtime/db/SQLCaster.java
	railo-java/railo-core/src/railo/runtime/functions/decision/IsValid.java
	railo-java/railo-core/src/railo/runtime/functions/displayFormatting/HTMLEditFormat.java
	railo-java/railo-core/src/railo/runtime/functions/image/ImageFilter.java
	railo-java/railo-core/src/railo/runtime/img/Image.java
	railo-java/railo-core/src/railo/runtime/img/filter/ApplyMaskFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/AverageFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/BicubicScaleFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/BinaryFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/BlockFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/BlurFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/BorderFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/BoxBlurFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/BrushedMetalFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/BumpFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/CausticsFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/CellularFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ChannelMixFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/CheckFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ChromaKeyFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ChromeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/CircleFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/CompositeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/CompoundFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ContourFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ContrastFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ConvolveFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/CropFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/CrystallizeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/CurlFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/CurvesFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/DespeckleFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/DiffuseFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/DiffusionFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/DilateFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/DisplaceFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/DissolveFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/DitherFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/DynFiltering.java
	railo-java/railo-core/src/railo/runtime/img/filter/EdgeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/EmbossFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/EqualizeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ErodeAlphaFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ErodeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ExposureFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/FBMFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/FadeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/FeedbackFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/FieldWarpFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/FillFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/FlareFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/FlipFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/Flush3DFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/FourColorFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/GainFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/GammaFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/GaussianFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/GlintFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/GlowFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/GradientFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/GradientWipeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/GrayFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/GrayscaleFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/HSBAdjustFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/HalftoneFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ImageCombiningFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ImageFilterUtil.java
	railo-java/railo-core/src/railo/runtime/img/filter/InterpolateFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/InvertAlphaFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/InvertFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/IteratedFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/JavaLnFFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/KaleidoscopeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/KeyFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/LensBlurFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/LevelsFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/LifeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/LightFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/LookupFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/MapColorsFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/MapFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/MarbleFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/MarbleTexFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/MaskFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/MaximumFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/MedianFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/MinimumFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/MirrorFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/MotionBlurFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/MutatableFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/NoiseFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/OffsetFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/OilFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/OpacityFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/OutlineFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/PerspectiveFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/PinchFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/PlasmaFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/PointFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/PointillizeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/PolarFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/PosterizeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/PremultiplyFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/QuantizeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/QuiltFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/RGBAdjustFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/RaysFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ReduceNoiseFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/RenderTextFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/RescaleFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/RippleFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/RotateFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/SaturationFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ScaleFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ScratchFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ShadeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ShadowFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ShapeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/SharpenFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ShatterFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ShearFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ShineFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/SkeletonFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/SkyFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/SmartBlurFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/SmearFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/SolarizeFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/SparkleFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/SphereFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/StampFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/SwimFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/TextureFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/ThresholdFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/TileImageFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/TransferFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/TransformFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/TransitionFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/TwirlFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/UnpremultiplyFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/UnsharpFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/VariableBlurFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/WarpFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/WaterFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/WeaveFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/WholeImageFilter.java
	railo-java/railo-core/src/railo/runtime/img/filter/WoodFilter.java
	railo-java/railo-core/src/railo/runtime/listener/AppListenerUtil.java
	railo-java/railo-core/src/railo/runtime/listener/ClassicApplicationContext.java
	railo-java/railo-core/src/railo/runtime/listener/ModernAppListener.java
	railo-java/railo-core/src/railo/runtime/op/Caster.java
	railo-java/railo-core/src/railo/runtime/reflection/Reflector.java
	railo-java/railo-core/src/railo/runtime/tag/Application.java
	railo-java/railo-core/src/railo/runtime/tag/FileTag.java
	railo-java/railo-core/src/railo/runtime/type/scope/ClientCookie.java
	railo-java/railo-core/src/railo/runtime/type/scope/ClientCookieOld.java
	railo-java/railo-core/src/railo/runtime/type/scope/ClientCookieSimple.java
	railo-java/railo-core/src/railo/runtime/type/scope/ClientDatasource.java
	railo-java/railo-core/src/railo/runtime/type/scope/ClientFile.java
	railo-java/railo-core/src/railo/runtime/type/scope/ClientMemory.java
	railo-java/railo-core/src/railo/runtime/type/scope/ClientPlus.java
	railo-java/railo-core/src/railo/runtime/type/scope/ScopeContext.java
	railo-java/railo-core/src/railo/runtime/type/scope/storage/StorageScopeImpl.java
	railo-java/railo-core/src/railo/runtime/util/ApplicationContextPro.java
	railo-java/railo-core/src/railo/transformer/bytecode/expression/var/Assign.java
	railo-java/railo-core/src/railo/transformer/bytecode/statement/java/Assign.java
	railo-java/railo-core/src/railo/transformer/cfml/evaluator/impl/Script.java
	railo-java/railo-core/src/railo/transformer/cfml/expression/CFMLExprTransformer.java
	railo-java/railo-core/src/railo/transformer/cfml/script/JavaScriptTransformer.java
	railo-java/railo-core/src/railo/transformer/cfml/tag/CFMLTransformer.java
	railo-java/railo-core/src/railo/transformer/util/CFMLString.java
	railo-java/railo-core/src/resource/context/railo-context.ra
	railo-java/railo-core/src/resource/fld/web-cfmfunctionlibrary_1_0
	railo-java/railo-core/src/resource/tld/web-cfmtaglibrary_1_0
	railo-java/railo-loader/src/railo/runtime/type/Scope.java