420 noscope
Merge remote-tracking branch 'origin/version-1.0' into version-1.0

Conflicts:
	core/components/kas/model/kas/kass.class.php