Commit
Merge branch 'master' of https://github.com/johntk/JAKD

Conflicts:
	src/db/DBconnection.java
	src/gui/HomeScreen.java
	src/kioskScreens/KioskQueries.java
Merge branch 'master' of https://github.com/johntk/JAKD

Conflicts:
	src/db/DBconnection.java
	src/db/POSOperations.java
	src/gui/HomeScreen.java
	src/kioskScreens/KioskQueries.java