Merge pull request #16 from SCPR/dev-renting

Merges branches for deploy