Merge pull request #61 from guestisp/master

Pull request to sync the code
Welcome email message creation fixed
Merge pull request #63 from shinesoftware/sandbox

Merge all the updates to Master