Merge branch 'hotfix/2.2.16'
Fix for search field reset icon (without conflict)
Compiled @caouecs pull request
Merge branch 'hotfix/2.2.17'
Merge branch 'develop' of github.com:GumbyFramework/Gumby into develop
minor structure fix between forms and tabs sections