Dbconnection changes
Test
test
Merge branch 'master' of https://github.com/johntk/JAKD

Conflicts:
	src/kioskScreens/AudioPlayer.java