asd
Merge remote-tracking branch 'origin/version-1.0' into version-1.0

Conflicts:
	core/components/kas/processors/mgr/kas/language/create.class.php