Test Leroy ...
Merge branch 'master' of https://github.com/HWRcrew/Staffbase

Conflicts:
	tests/junit/SQLQueryTest.java