work on sales checkout: DONE
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/OSIA.apk
	bin/classes.dex
	bin/classes/com/cse470/osia/DashBoardActivity.class
	bin/classes/com/cse470/osia/DatabaseHandler.class
	bin/classes/com/cse470/osia/SalesOrder.class
	src/com/cse470/osia/DatabaseHandler.java
	src/com/cse470/osia/SalesOrder.java