Merge origin/master

Conflicts:
	src/trabalho/screens/admin_screens/EditUsersScreen.java