- Cleaned up interfaces
Merge branch 'master' into streaming

Conflicts:
	src/builder/texture-builder.cpp
- Fixup for fonts