Merge pull request #25 from ChrisBoesch/master

update
country selection in profile edition
Merge pull request #259 from ruijunhuang2010/master

update