Merge remote-tracking branch 'origin/2' into CP-8
Merge branch 'CP-8' of github.com:andrykrp/crossposting into CP-8
grails dependency fix + additional repositories