Merge pull request #1 from guillaumededrie/develop

Develop
Finish feeds
Merge branch 'master' of https://github.com/guillaumededrie/guillaume.dedrie.fr