Added user merge
Merge branch 'master' of github.com:WoltLab/com.woltlab.wcf.conversation