default to not overwrite with 'grails init'
Merge branch 'master' of github.com:grails/grails-core
update to latest cache plugin
fix POMs after changes to dependency structure
fixed typo and added setting thread local converter configuration
added loading configured marshallers while creating an array with the default ones
Merge pull request #496 from wololock/GRAILS-11116

GRAILS-11116 Custom marshaller registrar bean does not work - new fix
fix failing tests due to change to HTTPS on grails.org
remove junit as compile time dependency
add JUnit to test time dependencies in GrailsCoreDependencies
Merge branch '2.3.x'

Conflicts:
	grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.java
	grails-web/build.gradle
fix failing tests
Merge branch '2.3.x'

Conflicts:
	grails-bootstrap/src/test/groovy/org/codehaus/groovy/grails/resolve/IvyDependencyManagerTests.groovy
fix retrieval of plugins from central repo
Merge branch '2.3.x'
Revert "added loading configured marshallers while creating an array with the default ones"

This reverts commit 232b7f62b5bdf58d09f64672ad26edd8fccdc22c.
Revert "fixed typo and added setting thread local converter configuration"

This reverts commit 1e1c57b394269f41d33a703e7283ad8c69acfd00.
add .travis.yml
Add Travis build status
ignore test on travis