Merge branch 'issue628' into 1.6.x
Merge branch 'issue628' into 1.6.x
Merge branch 'issue558' into 1.6.x
deprecate InjectableWroManagerFactoryDecorator
use Map instead of HashMap in GroovyModelParser when checking instanceof
fix merge conflicts