Added Ace to composer.json
Merge branch 'master' of https://github.com/romaricdrigon/LogicielTrez-Symfony
Fixed conflict between jQuery and Webshim