[z2348] Implanted Official GM Mail (GM+Item or GM)

Signed-off-by: Salja <salja2012@hotmail.de>
Merge branch 'master' into testing