.
.
.
Merge pull request #212 from Ranjith15/master

update plancode&&parentclient
.
Merge remote-tracking branch 'upstream/master'
Email checking
Merge remote-tracking branch 'upstream/master'
Merge pull request #213 from Ranjith15/master

email checking
.
.
Merge pull request #214 from kiranhugo/master

fixed some minor issues
selfcareProcessChanges
selfcareProcessChangesAfterConflicts