Merge branch 'removeDeprecates' into 1.6.x
update release version to 1.7.0-SNAPSHOT
temporarily remove osgi-examples project
use 304 header when resource served by proxy is unchanged
Merge branch 'prepareRelease' into 1.7.x
fix merge conflicts
update grails plugin to use latest released version of wro4j
Merge branch 'grailsUpdate' into 2.0.x