added picker view to the location screen, going to be cities corresponding to the country the user chooses
Merge remote-tracking branch 'origin'