.
Merge branch 'master' of github.com:rvkennedy/glfx

Conflicts:
	glfx_x64_VC11.vcxproj
	src/glfx.ypp
	src/glfxLALRParser.cpp
	src/glfxScanner.cpp
	src/glfxScanner.h