merge app into single folder
fix reporting
update quotation logo