Merge origin/master

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