testing sonar
Merge branch 'master' of https://github.com/moontwink/CIsys

Conflicts:
	src/database/DBConnection.java