use setup version everywhere
Merge branch '3.1' into 3.2
Merge branch '3.2' into 3.3

Conflicts:
	Kwf/Config.php
	Kwf/Util/ClearCache.php
remove deprected method, not required anymore now that we have setup versions