synch
Merge branch 'master' of https://github.com/pcou/pro1.git

Conflicts:
	test.xml
Merge branch 'master' of https://github.com/pcou/pro1.git

Conflicts:
	test.xml