Merge conflicts solutioned
[RRRRHHHH_Code] / ruralHouses / src / common / OfferInterface.java
2015-05-18 epinzolas001Merge conflicts solutioned