Merge branch 'master' of ssh://xp-dev.com/RRRRHHHH_Code
Conflicts:
ruralHouses client/src/domain/Owner.java
ruralHouses client/src/domain/RuralHouse.java
ruralHouses client/src/gui/BookRuralHouseConfirmationWindow.java
ruralHouses client/src/gui/ModifyOfferGUI.java
ruralHouses/src/dataAccess/DB4oManager.java
ruralHouses/src/domain/Booking.java
- [DH] ruralHouses/config.xml
- [DH] ruralHouses/src/businessLogic/AccountManager.java
- [DH] ruralHouses/src/businessLogic/AdminManager.java
- [DH] ruralHouses/src/businessLogic/BookingManager.java
- [DH] ruralHouses/src/businessLogic/LoginManager.java
- [DH] ruralHouses/src/businessLogic/OfferManager.java
- [DH] ruralHouses/src/common/AccountInterface.java
- [DH] ruralHouses/src/common/AdminInterface.java
- [DH] ruralHouses/src/common/BookingInterface.java
- [DH] ruralHouses/src/dataAccess/DB4oManager.java
- [DH] ruralHouses/src/domain/Account.java
- [DH] ruralHouses/src/domain/Administrator.java
- [DH] ruralHouses/src/domain/Booking.java
- [DH] ruralHouses/src/domain/Client.java
- [DH] ruralHouses/src/domain/Owner.java
- [DH] ruralHouses/src/domain/RuralHouse.java
- [DH] ruralHouses/src/gui/AdminMenuGUI.java
- [DH] ruralHouses/src/gui/BookRuralHouseConfirmationWindow.java
- [DH] ruralHouses/src/gui/DeleteOfferGUI.java
- [DH] ruralHouses/src/gui/DeleteOwnerGUI.java
- [DH] ruralHouses/src/gui/HouseFeaturesGUI.java
- [DH] ruralHouses/src/gui/ModifyHouseGUI.java
- [DH] ruralHouses/src/gui/ModifyOfferGUI.java
- [DH] ruralHouses/src/gui/OwnerRegistrationGUI.java
- [DH] ruralHouses/src/gui/listOfAdditionRequestsGUI.java
- [DH] ruralHouses/src/gui/listOfBookingRequestsGUI.java
- [DH] ruralHouses/src/gui/listOfOffers.java
- [DH] ruralHouses/src/gui/listOfOwnerAddittionRequests.java
- [DH] ruralHouses/src/gui/listOfRemovalRequestsGUI.java