Resolved TODO
Merge branch 'master' of github.com:WoltLab/WCF

Conflicts:
	com.woltlab.wcf/template/userPanel.tpl