Updated WCF
Updated WCF
Merge branch 'master' of github.com:fragsalat/wbb

Conflicts:
	plugins/feed/acpMenu.xml
	plugins/shop/acpMenu.xml
	wcf/lib/acp/form/ArticleAddForm.class.php
	wcf/lib/acp/form/FeedAddForm.class.php
Fixed varaible names for a valid install.sql