Merge origin/master

Conflicts:
	Camara/src/vitor/MostrarMonumentos.java