Merge branch 'develop' of github.com:arlaneenalra/silex-template into develop