Fixed permission check
Merge branch '2.0'

Conflicts:
	com.woltlab.wcf/templates/user.tpl
Merge branch 'master' of github.com:WoltLab/WCF