Fix cs and using statement in several files
Merge pull request #326 from akeneo/fix-cs-2.0

Fix cs and using statement in several files