Merge pull request #251 from Rakeshadlagatta/master

changes to tickets
build1 bug fixes completed
Merge remote-tracking branch 'upstream/master'
after cleanup
build1 bug fixes completed
..
Merge pull request #252 from raghuvissu/master

build1 bug fixes completed
..
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
datetime to eventmaster
Merge remote-tracking branch 'upstream/master'