Merge branch '3.3' into develop

Conflicts:
	railo-cfml/railo-admin/admin/overview.cfm
	railo-cfml/railo-admin/admin/resources/language/de.xml
	railo-cfml/railo-admin/admin/resources/language/en.xml
	railo-cfml/railo-admin/admin/web.cfm
	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/ConfigServerImpl.java
	railo-java/railo-core/src/railo/runtime/config/ConfigWebFactory.java
	railo-java/railo-core/src/railo/runtime/functions/system/GetMemoryUsage.java
	railo-java/railo-core/src/railo/runtime/tag/Admin.java
	railo-java/railo-core/src/railo/transformer/bytecode/extern/StringExternalizerWriter.java
	railo-java/railo-core/src/railo/transformer/bytecode/statement/tag/TagLoop.java
	railo-java/railo-core/src/resource/context/admin/resources/language/de.xml
	railo-java/railo-core/src/resource/context/admin/resources/language/en.xml
	railo-java/railo-core/src/resource/context/railo-context.ra
Merge branch '3.3' into develop

Conflicts:
	railo-cfml/railo-admin/admin/overview.cfm
	railo-cfml/railo-admin/admin/resources/language/de.xml
	railo-cfml/railo-admin/admin/resources/language/en.xml
	railo-cfml/railo-admin/admin/web.cfm
	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/ConfigServerImpl.java
	railo-java/railo-core/src/railo/runtime/config/ConfigWebFactory.java
	railo-java/railo-core/src/railo/runtime/functions/system/GetMemoryUsage.java
	railo-java/railo-core/src/railo/runtime/tag/Admin.java
	railo-java/railo-core/src/railo/transformer/bytecode/extern/StringExternalizerWriter.java
	railo-java/railo-core/src/railo/transformer/bytecode/statement/tag/TagLoop.java
	railo-java/railo-core/src/resource/context/admin/resources/language/de.xml
	railo-java/railo-core/src/resource/context/admin/resources/language/en.xml
	railo-java/railo-core/src/resource/context/railo-context.ra
Merge branch '3.3' into develop

Conflicts:
	railo-cfml/railo-admin/admin/overview.cfm
	railo-cfml/railo-admin/admin/resources/language/de.xml
	railo-cfml/railo-admin/admin/resources/language/en.xml
	railo-cfml/railo-admin/admin/web.cfm
	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/ConfigServerImpl.java
	railo-java/railo-core/src/railo/runtime/config/ConfigWebFactory.java
	railo-java/railo-core/src/railo/runtime/functions/system/GetMemoryUsage.java
	railo-java/railo-core/src/railo/runtime/tag/Admin.java
	railo-java/railo-core/src/railo/transformer/bytecode/extern/StringExternalizerWriter.java
	railo-java/railo-core/src/railo/transformer/bytecode/statement/tag/TagLoop.java
	railo-java/railo-core/src/resource/context/admin/resources/language/de.xml
	railo-java/railo-core/src/resource/context/admin/resources/language/en.xml
	railo-java/railo-core/src/resource/context/railo-context.ra
Merge branch '3.3' into develop

Conflicts:
	railo-cfml/railo-admin/admin/overview.cfm
	railo-cfml/railo-admin/admin/resources/language/de.xml
	railo-cfml/railo-admin/admin/resources/language/en.xml
	railo-cfml/railo-admin/admin/web.cfm
	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/ConfigServerImpl.java
	railo-java/railo-core/src/railo/runtime/config/ConfigWebFactory.java
	railo-java/railo-core/src/railo/runtime/functions/system/GetMemoryUsage.java
	railo-java/railo-core/src/railo/runtime/tag/Admin.java
	railo-java/railo-core/src/railo/transformer/bytecode/extern/StringExternalizerWriter.java
	railo-java/railo-core/src/railo/transformer/bytecode/statement/tag/TagLoop.java
	railo-java/railo-core/src/resource/context/admin/resources/language/de.xml
	railo-java/railo-core/src/resource/context/admin/resources/language/en.xml
	railo-java/railo-core/src/resource/context/railo-context.ra
Merge branch '3.3' into develop

Conflicts:
	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/net/http/ReqRspUtil.java
	railo-java/railo-core/src/railo/transformer/bytecode/Page.java
	railo-java/railo-core/src/resource/context/railo-context.ra
Merge branch '3.3' into develop

Conflicts:
	railo-java/railo-core/src/railo/commons/io/SystemUtil.java
	railo-java/railo-core/src/railo/runtime/Info.ini
	railo-java/railo-core/src/railo/runtime/tag/Admin.java
	railo-java/railo-core/src/railo/runtime/tag/DBInfo.java
	railo-java/railo-core/src/railo/runtime/tag/PDF.java
	railo-java/railo-core/src/railo/runtime/type/UDFImpl.java
	railo-java/railo-core/src/railo/transformer/bytecode/Page.java
	railo-java/railo-core/src/resource/context/railo-context.ra
Merge branch '3.3' into develop

Conflicts:
	railo-java/railo-core/src/railo/commons/io/SystemUtil.java
	railo-java/railo-core/src/railo/runtime/Info.ini
	railo-java/railo-core/src/railo/runtime/tag/Admin.java
	railo-java/railo-core/src/railo/runtime/tag/DBInfo.java
	railo-java/railo-core/src/railo/runtime/tag/PDF.java
	railo-java/railo-core/src/railo/runtime/type/UDFImpl.java
	railo-java/railo-core/src/railo/transformer/bytecode/Page.java
	railo-java/railo-core/src/resource/context/railo-context.ra
Merge branch '3.3' into develop

Conflicts:
	railo-cfml/railo-admin/admin/development.debugging.cfm
	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/ConfigWebAdmin.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/debug/DebuggerImpl.java
	railo-java/railo-core/src/railo/runtime/net/http/ReqRspUtil.java
	railo-java/railo-core/src/railo/runtime/tag/Admin.java
	railo-java/railo-core/src/railo/runtime/type/scope/ScopeContext.java
	railo-java/railo-core/src/railo/runtime/type/util/QueryUtil.java
	railo-java/railo-core/src/resource/context/railo-context.ra
Merge branch '3.3' into develop

Conflicts:
	railo-cfml/railo-admin/admin/development.debugging.cfm
	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/ConfigWebAdmin.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/debug/DebuggerImpl.java
	railo-java/railo-core/src/railo/runtime/net/http/ReqRspUtil.java
	railo-java/railo-core/src/railo/runtime/tag/Admin.java
	railo-java/railo-core/src/railo/runtime/type/scope/ScopeContext.java
	railo-java/railo-core/src/railo/runtime/type/util/QueryUtil.java
	railo-java/railo-core/src/resource/context/railo-context.ra
changed version to 4.0.0.005
build by deploy process
Merge branch '3.3' into develop

Conflicts:
	railo-cfml/railo-admin/admin/development.debugging.cfm
	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/ConfigWebAdmin.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/debug/DebuggerImpl.java
	railo-java/railo-core/src/railo/runtime/net/http/ReqRspUtil.java
	railo-java/railo-core/src/railo/runtime/tag/Admin.java
	railo-java/railo-core/src/railo/runtime/type/scope/ScopeContext.java
	railo-java/railo-core/src/railo/runtime/type/util/QueryUtil.java
	railo-java/railo-core/src/resource/context/railo-context.ra
removed unecessary images
add support for fullscreen mode to Railo Admin
add sanselan lib
build by delpoy process
build by delpoy process
Initial pass at the ESAPI functions
trapping output from the ESAPI library…
removing the licenses from the classpath