Some changes to structure
Merge branch 'master' of https://github.com/wtw-software/Event-Master

Conflicts:
	DBTester/src/tests/CoreTest.java
	DBTester/src/tests/Main.java