Mais um monte
Merge remote-tracking branch 'origin/renata-dev' into main-dev
Merge branch 'bernardo-dev' into main-dev

Conflicts:
	ORB_v1.1-ejb/dist/ORB_v1.1-ejb.jar
	ORB_v1.1-war/build/web/WEB-INF/classes/com/orb/controllers/PropertyController.class
	ORB_v1.1-war/build/web/WEB-INF/classes/com/orb/controllers/RentController.class
	ORB_v1.1-war/build/web/WEB-INF/classes/com/orb/controllers/VisitHistoryController.class
	ORB_v1.1-war/dist/ORB_v1.1-war.war
	ORB_v1.1-war/src/java/com/orb/controllers/PropertyController.java
	build/ORB_v1.1-ejb.jar
	build/ORB_v1.1-war.war
	dist/ORB_v1.1.ear
	dist/gfdeploy/ORB_v1.1/ORB_v1.1-war_war/WEB-INF/classes/com/orb/controllers/PropertyController.class
	dist/gfdeploy/ORB_v1.1/ORB_v1.1-war_war/WEB-INF/classes/com/orb/controllers/RentController.class
	dist/gfdeploy/ORB_v1.1/ORB_v1.1-war_war/WEB-INF/classes/com/orb/controllers/VisitHistoryController.class