Merge pull request #113 from burtbeckwith/1.6.x

some cleanup for the Grails plugin
merge issue705

sue705' into 1.6.x

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'i108' into 1.6.x
merge pull request (add wroContextFilter)
Add missing import statements
fix merge conflicts