remote submodule change 2222
Merge branch 'master' of https://github.com/ikhvorost/test

Conflicts:
	file2.xml