junki pretty much completed settings
Merge branch 'master' of https://github.com/mitraraman/socialtraveler
Merge branch 'master' of https://github.com/mitraraman/socialtraveler