Merge branch 'master' of ssh://xp-dev.com/RRRRHHHH_Code

Conflicts:
	ruralHouses client/src/gui/ModifyOfferGUI.java
	ruralHouses/src/dataAccess/DB4oManager.java

diff --cc ruralHouses client/src/gui/ModifyOfferGUI.java
index 82efb8d,7cb5b85..9259130
--- 1/ruralHouses client/src/gui/ModifyOfferGUI.java
--- 2/ruralHouses client/src/gui/ModifyOfferGUI.java
+++ b/ruralHouses client/src/gui/ModifyOfferGUI.java
@@@ -75,23 -68,8 +75,26 @@@ public class ModifyOfferGUI extends JFr
                this.setSize(new Dimension(513, 433));
                this.setTitle("Set availability");
  
++<<<<<<< HEAD
 +
 +              try {
 +                      om = (OfferInterface) Naming
 +                                      .lookup(___IntNames.OfferManager);
 +                      hm = (HouseInterface) Naming
 +                                      .lookup(___IntNames.HouseManager);
 +              } catch (Exception e1) {
 +                      System.out.println("Error accessing remote authentication: "
 +                                      + e1.toString());
 +              }
 +              try {
 +                      Hlist = hm.getHouses(o, null, null, 0, 0, 0, 0, 0);
 +              } catch (RemoteException e1) {
 +                      e1.printStackTrace();
 +              }
++=======
++>>>>>>> 25898b619dd708c9f15a44200b545cac11404b73
                
 -              jComboBox1 = new JComboBox<RuralHouse>(v);
 +              jComboBox1 = new JComboBox<RuralHouse>(Hlist);
  
                comboBox_o = new JComboBox<Offer>(
                                ((RuralHouse) jComboBox1.getSelectedItem()).getAllOffers());

diff --cc ruralHouses/src/dataAccess/DB4oManager.java
index 0fb0c74,6089a74..d8a59f2
--- 1/ruralHouses/src/dataAccess/DB4oManager.java
--- 2/ruralHouses/src/dataAccess/DB4oManager.java
+++ b/ruralHouses/src/dataAccess/DB4oManager.java
@@@ -220,23 -219,7 +219,24 @@@ public class DB4oManager 
                }
        }
  
 -      public Administrator getAdminData() {
 +      public Vector<Offer> getRHsOffer(String name){
 +              if (c.isDatabaseLocal() == false)
 +                      openSDB();
 +              else
 +                      openDB();
 +
 +              try {
 +                      RuralHouse rh = (RuralHouse)db.queryByExample(new RuralHouse(name, null, null, null, null)).get(0);
 +                      Offer proto = new Offer(0, rh, null, null, 0);
 +                      ObjectSet<Offer> result = db.queryByExample(proto);
 +                      return new Vector<Offer>(result);
 +              } finally {
 +                      db.close();
 +              }
 +      }
 +      
 +      public Administrator getAdminData(){
++
                if (c.isDatabaseLocal() == false)
                        openSDB();
                else

diff --cc ruralHouses/src/domain/Account.java
Simple merge