[separation of repositories]
Merge remote-tracking branch 'origin/master'

Conflicts:
	kur/kur.v12.suo