kio
Merge branch 'Branch2' into Branch1

Conflicts:
	filesample.txt