support activation per action based
Merge branch 'gunanka' into ambesh
activation link validity for one click
Merge branch 'gunanka' into ambesh
changes for feedback mailer