Fixed typo
Updated WCF version
Merge branch '2.0'

Conflicts:
	com.woltlab.wcf/package.xml
	wcfsetup/install/files/lib/system/WCF.class.php