Fixed the off-by-one on the font
Merge branch 'bestdev'

Conflicts:
	src/graphics/graphicsSDL.cpp
Merge master to bestdev