dev...

Signed-off-by: Kevin Nguyen <k.nguyen@thecodingmachine.com>
Merge branch '1.0' of git://github.com/thecodingmachine/cms.cms-controller into 1.0

Conflicts:
	src/Mouf/CMS/EvoluGridHandlerInterface.php
	src/views/cms-list-translate.php