Merge branch 'paramsource' into killsourceparam

Conflicts:
	includes/params/SMW_ParamSource.php