Added Israel and NY
Fixed location
Merge branch 'patch-1' of https://github.com/jbaruch/groovy-website into jbaruch-patch-1

Conflicts:
	site/src/site/pages/usergroups.groovy
Added Israel and NY
Fixed location
Merge branch 'jbaruch-patch-1'
tidy page after merge resolution