something here; something there
Merge branch 'refs/heads/cleanup' into dev

Conflicts:
	src/cdg/nut/util/BitmapFont.java