Merge branch 'simple_draft'
Merge branch 'simple_draft'
Merge branch 'simple_draft'
Merge branch 'simple_draft' of https://github.com/mteule/StationMeteo
Merge branch 'simple_draft'
Merge branch 'master' of https://github.com/mteule/StationMeteo into simple_draft-dev