adding token support to grails plugin
Merge branch 'master' of github.com:oohlalog/oohlalog_grails

Conflicts:
	OohLaLogGrailsPlugin.groovy