Added new journal type, customer note
Fixed merge
Merge