more changes to settings made by junki
Merge branch 'master' of https://github.com/mitraraman/socialtraveler