updated dev to develop
Merge branch 'develop' into feature/add-facebook-picto