manual merge of image stuff: xml
manual mergefix - imagecomp.java SUPER INVASIVE