[CH,MF]{issue} I22 - refactored Database class; refactored ActivityMsg;
Merge branch 'master' of https://github.com/RolandDanninger/sw14_xp_04