Merge branch 'master' into develop
Put images in image folder
Merge branch 'develop'