Added Columbus User Group Grails and Ales
misplaced title on merge conflict
Merge branch 'master' of https://github.com/dmahapatro/groovy-website into dmahapatro-master

Conflicts:
	site/src/site/pages/usergroups.groovy
Merge branch 'dmahapatro-master'