* empty the activation mail template
* modified user controller
Merge branch 'master' of https://github.com/guvootes/socialcircle