Rename Groovy sample file with a .gradle extension
Merge branch 'master' into 1372-local

Conflicts:
	lib/linguist/samples.json
Merge pull request #1553 from github/1372-local

1372 local