refactor DBConnection
Merge branch 'master' of github.com:mathiasose/fellesprosjekt

Conflicts:
	java_app/src/db/DBConnection.java