master changes
main 3
main 4
master 4
master 5
Merge branch 'master' of https://github.com/ikhvorost/test into features

Conflicts:
	file2.xml