Add Grammatical Framework
Change GF lexer from haskell to Haskell
Remove Gla and Gle from Gf test samples
Try to fix encoding probs by converting to utf8
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into GrammaticalFramework-master
regen samples.json on new master
Merge pull request #1089 from github/pr-668-updated

Add Grammatical Framework, part deux (replaces #668)
Merge branch 'master' into obj_cpp

Conflicts:
	lib/linguist/samples.json