commit
Merge branch 'master' of https://github.com/aviphpteam/SRO

Conflicts:
	test5.txt