Merge branch 'hotfix/res'
Merge branch 'develop'
corretto url
Merge branch 'hotfix/ajax-url' into develop