merge conflict
Merge branch 'development' of github.com:tmerlet/Photoapp into development