files added after grunt build
Few changes to screen two
Added screen -three
small changes to screen three
Merge branch 'task2#screen-two' into develop
Merge branch 'develop' of https://github.com/ajency/apartmentselector into develop
screen three along with the header
files added after pull
changes to screen two(unit Types based on tower)
Merge branch 'task#screen-three' into task#resolve-screen-two

Conflicts:
	wp-content/themes/apartmentselector/spa/src/apps/screen-two/screen-two-view.coffee
	wp-content/themes/apartmentselector/spa/src/apps/screen-two/screen-two-view.js
Merge branch 'develop' of https://github.com/ajency/apartmentselector into develop

Conflicts:
	wp-content/themes/apartmentselector/spa/src/apps/screen-two/screen-two-view.coffee
	wp-content/themes/apartmentselector/spa/src/apps/screen-two/screen-two-view.js
Merge branch 'develop' of https://github.com/ajency/apartmentselector into develop