screen three chnages
Merge branches 'task#phase2' and 'task#phase2' of https://github.com/ajency/apartmentselector into task#phase2
some changes