Merge branch 'issue742' into 1.6.x
encapsulate image rewriter logic to a dedicated class and use shoreter version of contextRelative image url's
tweak expiry headers
remove deprecated calsses
remove deprecated HashEncoderNamingStrategy
remove deprecated methos
fix failing tests
upgrade failing coffee-script node tests (after upgrade to cofee-1.6.3)
upgrade javadoc
update @since from 1.6.4->1.7.0
fix failing TestGroovyModelParser
fix failing TestGroovyModelParser
do not use deprecated method anymore
remove unnecessary method
fix merge conflicts
fix failing tests