wtf
Merge branch 'master' of https://github.com/wtw-software/Event-Master

Conflicts:
	DBTester/src/tests/Main.java
....
Merge branch 'master' of https://github.com/wtw-software/Event-Master