Merge branch 'patch-1' of https://github.com/lmivan/groovy-website

Conflicts:
	site/src/site/pages/usergroups.groovy