some changes
Merge branch 'task#phase2' of https://github.com/ajency/apartmentselector into task#phase2