this a test
Merge branch 'joestestbranch'
Merge branch 'master' of https://github.com/gathcon/RetailManagementSystem
Merge branch 'master' of https://github.com/gathcon/RetailManagementSystem
update date format, clear and scrollable textarea for order and invoice