Merge branch 'master' into jgrpp

# Conflicts:
#	src/string.cpp

src/fontcache.h

@@ -147,6 +147,11 @@ public:
 	{
 		return this->parent != NULL;
 	}
+
+	/**
+	 * Is this a built-in sprite font?
+	 */
+	virtual bool IsBuiltInFont() = 0;
 };
 
 /** Get the SpriteID mapped to the given font size and key */