add property wizard
merfe conflicts corrected
Merge pull request #21 from housegevity/feature/WIZARD

Feature/wizard