Update names of taxonomies
Fixed rewrite error
Merge branch 'develop' of github.com:OS2web/os2web_base_panels into develop