Merge pull request #253 from Ranjith15/master

code cleanup
.
.
editclientcontroller and editplancontroller files changed
Merge pull request #254 from raghuvissu/master

editclientcontroller and editplancontroller files changed
..
Merge remote-tracking branch 'upstream/master'