di in configuration
di in configuration
di in configuration
Merge remote-tracking branch 'origin/master'

Conflicts:
	plugin.xml
Merge branch 'master' of https://github.com/fzaker/RapidGrails