Added 'merge users by e-mail address'
Improved ACP user panel
Merge branch 'master' of github.com:WoltLab/WCF