Merge pull request #11 from SCPR/dev-renting

Address conflicts between two branches of the renting project and implements refactor of data and map code