Uns jsf
Merge branch 'main-dev' of https://github.com/bernardo-macedo/orb into main-dev
Mais jsf e talvez algumas mudancas em uns controllers
Merge remote-tracking branch 'origin/renata-dev' into main-dev
Merge remote-tracking branch 'origin/main-dev' into bernardo-dev

Conflicts:
	ORB_v1.1-ejb/build/classes/com/orb/entities/ORB_Customer_.class
	ORB_v1.1-ejb/build/classes/com/orb/entities/ORB_Location_.class
	ORB_v1.1-ejb/build/classes/com/orb/entities/ORB_Owner_.class
	ORB_v1.1-ejb/build/classes/com/orb/entities/ORB_Photo_.class
	ORB_v1.1-ejb/build/classes/com/orb/entities/ORB_Property.class
	ORB_v1.1-ejb/build/classes/com/orb/entities/ORB_Property_.class
	ORB_v1.1-ejb/build/classes/com/orb/entities/ORB_Rent_.class
	ORB_v1.1-ejb/build/classes/com/orb/entities/ORB_TypeOfProperty_.class
	ORB_v1.1-ejb/build/classes/com/orb/entities/ORB_User_.class
	ORB_v1.1-ejb/build/classes/com/orb/entities/ORB_VisitHistory_.class
	ORB_v1.1-ejb/dist/ORB_v1.1-ejb.jar
	ORB_v1.1-war/build/web/WEB-INF/classes/com/orb/controllers/LocationController.class
	ORB_v1.1-war/build/web/WEB-INF/classes/com/orb/controllers/OwnerController.class
	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/UserController.class
	ORB_v1.1-war/build/web/addProperty.xhtml
	ORB_v1.1-war/build/web/addUser.xhtml
	ORB_v1.1-war/build/web/index.xhtml
	ORB_v1.1-war/dist/ORB_v1.1-war.war
	ORB_v1.1-war/src/java/com/orb/controllers/LocationController.java
	ORB_v1.1-war/src/java/com/orb/controllers/PropertyController.java
	ORB_v1.1-war/web/addProperty.xhtml
	ORB_v1.1-war/web/addUser.xhtml
	ORB_v1.1-war/web/index.xhtml
	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-ejb_jar/com/orb/entities/ORB_Customer_.class
	dist/gfdeploy/ORB_v1.1/ORB_v1.1-ejb_jar/com/orb/entities/ORB_Location_.class
	dist/gfdeploy/ORB_v1.1/ORB_v1.1-ejb_jar/com/orb/entities/ORB_Owner_.class
	dist/gfdeploy/ORB_v1.1/ORB_v1.1-ejb_jar/com/orb/entities/ORB_Photo_.class
	dist/gfdeploy/ORB_v1.1/ORB_v1.1-ejb_jar/com/orb/entities/ORB_Property.class
	dist/gfdeploy/ORB_v1.1/ORB_v1.1-ejb_jar/com/orb/entities/ORB_Property_.class
	dist/gfdeploy/ORB_v1.1/ORB_v1.1-ejb_jar/com/orb/entities/ORB_Rent_.class
	dist/gfdeploy/ORB_v1.1/ORB_v1.1-ejb_jar/com/orb/entities/ORB_TypeOfProperty_.class
	dist/gfdeploy/ORB_v1.1/ORB_v1.1-ejb_jar/com/orb/entities/ORB_User_.class
	dist/gfdeploy/ORB_v1.1/ORB_v1.1-ejb_jar/com/orb/entities/ORB_VisitHistory_.class
	dist/gfdeploy/ORB_v1.1/ORB_v1.1-ejb_jar/resouces.res
	dist/gfdeploy/ORB_v1.1/ORB_v1.1-war_war/WEB-INF/classes/com/orb/controllers/LocationController.class
	dist/gfdeploy/ORB_v1.1/ORB_v1.1-war_war/WEB-INF/classes/com/orb/controllers/OwnerController.class
	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/UserController.class
	dist/gfdeploy/ORB_v1.1/ORB_v1.1-war_war/addProperty.xhtml
	dist/gfdeploy/ORB_v1.1/ORB_v1.1-war_war/addUser.xhtml
	dist/gfdeploy/ORB_v1.1/ORB_v1.1-war_war/index.xhtml