image upload and css merge

update to sync prior to merging in new changes.