Merge pull request #119 from ChrisBoesch/master

Updates
Profile : Edit location should be grey out.
Merge pull request #383 from ShaikDawood/master

Profile : Edit location should be grey out.
Merge pull request #384 from ruijunhuang2010/master

Merge pull request #7 from ChrisBoesch/master
Merge pull request #8 from ChrisBoesch/master

update