Polo
Merge branch 'master' into Remi
Merge branch 'master' of https://github.com/Tamazy/_test

Conflicts:
	main.php
polo
polo
Merge branch 'master' into Remi

Conflicts:
	main.php