update
Merge branch 'develop' of https://github.com/purencool/silex into develop