.
Merge remote-tracking branch 'upstream/master'
Merge pull request #74 from raghuvissu/master

address manage edit functionality changes