Fix CRAFTERCMS-560
See issue for further instructions
Update log4j.xml
Merge pull request #8 from cortiz/master

Fix CRAFTERCMS-560
Fix posible collition with webAppRootKey
Merge pull request #11 from avasquez614/master

Added GroovyScriptFactory
Merge pull request #12 from avasquez614/master

CRAFTERCMS-588: Implemented feature.
Upgrade to java 7
prepare for next development iteration
Merge pull request #15 from avasquez614/master

Fixed issue with RenderComponentDirective throwing ClassCastException wh...
Merge branch 'master' of https://github.com/craftercms/engine