Merge pull request #1342 from sgrenier/next

Support for multiple font sizes per Font
Fixed issues in textured shader when using bump mapping and spot lights.