more changes to merge journals, support for uploading spreadsheets on web