Email management
Merge branch 'master' of https://github.com/RoOoBerT/awar.git