created image/merge and resource/merge
return url and thumbnail on the image/merge method
now requiring PHP5.4 as some of it's syntax is being used
cleaned up the admin pages a bit
fixed image admin page
admin UI for merging, plus random code cleanup
fix external comments link on info page