Pour merge
Merge branch 'master' of https://github.com/Olybrius/JavaEE-EventManager

Conflicts:
	src/main/java/emn/tp/servlet/Events.java
	src/main/java/emn/tp/servlet/Register.java