made location selection page
Merge branch 'master' of github.com:zqzas/maya