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

Conflicts:
	DBTester/src/tests/CoreTest.java