merge
Merge branch 'develop' of https://github.com/PureSrc/grails-arrested-plugin into develop

Conflicts:
	ArrestedGrailsPlugin.groovy
	plugin.xml
controllers