Merge pull request #254 from raghuvissu/master

editclientcontroller and editplancontroller files changed
createprice screen cancel button id updated
Merge remote-tracking branch 'upstream/master'