made Image more useful for more than just an icon
Merge branch 'gui-merging'

Conflicts:
	headers/gamegui.h

This is another merge since I want the slightly-improved Image class to
be in master. Although, it's up the GUI team whether they want to use it
or code it directly in with SDL calls.