Finished UserController
Abrindo projeto
Merge branch 'bernardo-dev' into main-dev

Conflicts:
	ORB_v1.1-ejb/build/classes/com/orb/ejb/UserFacade.class
	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_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-war/build/web/WEB-INF/classes/com/orb/controllers/UserController.class
	ORB_v1.1-war/src/java/com/orb/controllers/UserController.java
Merge remote-tracking branch 'origin/main-dev' into main-dev
Creating Owner Controller
Merge remote-tracking branch 'origin/main-dev' into bernardo-dev