Error checking for invoice printing: OS detection, empty table detection
Merge branch 'master' of https://github.com/truly-auto/SENG403.git
Merge branch 'master' of https://github.com/truly-auto/SENG403.git
Merge branch 'master' of https://github.com/truly-auto/SENG403.git

Signed-off-by: Chih-Hsuan Huang <gemhuang2151992@gmail.com>
finish formatting invoice tab; done error checking for printing invoice
order and item class integrated
fixing merge conflict
merge conflict
Fixed duplicate Jane_Doe
added tests and removed confusing button from supermarket interface
Quick update with full functionality

integration with item and order as well
something
test
fixing merge probs
removed button again and added refresh button again
Tests and Order update
Finished up tests
cleaning up merge conflicts lines
testing

Signed-off-by: ericckk <kingem43@hotmail.com>
Merge branch 'master' of https://github.com/truly-auto/SENG403

Conflicts:
	invoice_supermarket2.xls
	src/main/java/FoodLink/gui/SupermarketSys.java

merging to master