Email updates
Merge branch 'master' of github.com-everon:oliwierptak/Everon
Merge branch 'master' into development