dev
Merge branch 'master' of github.com:leahpar/Chassor

Conflicts:
	src/Raf/ChassorCoreBundle/OCB/OCBChaine.php
	src/Raf/ChassorCoreBundle/OCB/OCBEnigme.php
merge