Merge branch 'jillian/eventServices' of github.com:h3art/OTE into jillian/eventServices

Conflicts:
	src/main/java/com/main/EventController.java
	src/main/java/com/main/EventService.java
Merge branch 'jillian/eventServices' of github.com:h3art/OTE into jillian/eventServices

Conflicts:
	src/main/java/com/main/EventService.java