merged Markus<->Sophia
Revert "merged Markus<->Sophia"

This reverts commit d2505205aa2215f204c6d4a39c2556db8b16831d.
Merge branch 'master' of https://github.com/manageyourteam/myt_neu.git