added  bitmap format stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/gpu/gpu.c