Merge remote-tracking branch 'origin/gui_image_comp' into gui

Conflicts:
	HighlanderChef/.classpath
	HighlanderChef/src/com/highlanderchef/PreviewCallback.java