Merge conflicts solutioned
[RRRRHHHH_Code] / ruralHouses client / config.xml
2015-05-18 epinzolas001Merge conflicts solutioned