Merge origin/master

Conflicts:
	src/projeto/userinterface/events/EventsListPanel.form
	src/projeto/userinterface/events/EventsListPanel.java
Merge origin/master