Merge origin/master

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

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

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

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

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

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