merge develop in master
merge develop in master
Merge branch 'develop'
Merge branch 'develop'
reactivate catch error
Merge branch 'master' into develop