moved email fixes to branch from the devbranch instead of master