.frag file extension added for JavaScript with some new samples
Merge branch 'master' into 1178

Conflicts:
	lib/linguist/samples.json
Merge pull request #1227 from github/1178-update

1178 update