Merge origin/master

Conflicts:
	src/projeto/userinterface/MainWindow.java
Merge origin/master
Merge origin/master

Conflicts:
	src/projeto/userinterface/MainWindow.java
Merge origin/master

Conflicts:
	src/projeto/userinterface/restaurants/RestaurantePanel.form
Merge origin/master

Conflicts:
	src/projeto/userinterface/restaurants/RestaurantePanel.form
Merge origin/master

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

Conflicts:
	src/projeto/userinterface/events/AddEventPanel.form
	src/projeto/userinterface/events/AddEventPanel.java
	src/projeto/userinterface/events/EventPanel.form
	src/projeto/userinterface/events/EventPanel.java