* bumpmapping sample continued
* fixing linker errors
* added text support to fixed function pipeline
* bumpmapping sample continued
* improved .gitignore
Merge branch 'master' of https://github.com/pboechat/FastCG

Conflicts:
	core/src/Material.cpp
	samples/bumpmapping/bumpmapping.vcxproj
	samples/bumpmapping/bumpmapping.vcxproj.filters
	samples/bumpmapping/shaders/BumpedDiffuse.frag
	samples/bumpmapping/shaders/BumpedSpecular.frag
	samples/bumpmapping/shaders/BumpedSpecular.vert
	samples/bumpmapping/src/BumpMappingApplication.cpp
	samples/bumpmapping/src/BumpMappingApplication.cpp.orig
	samples/bumpmapping/src/BumpMappingApplication.h