Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/org/JavaArt/TicketManager/controllers/EventsController.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/views/Events.jsp