Properly closes DB connection now
Merge remote-tracking branch 'origin/master'

Conflicts:
	AAH/build/built-jar.properties
	AAH/dist/AAH.html
	AAH/dist/AAH.jar
	AAH/dist/AAH.jnlp
	AAH/src/aah/AAH.java