Updating github integration
Bug fixing
Merge remote-tracking branch 'origin/master' into Encryption&Email-Refactor