changes from roshan, mailer and ui updates
Merge branch 'feature/Phase2' of https://github.com/pixces/cnksite into feature/Phase2