Merges taxonomies

* Merged articlesubtype and genericlistsubtype to nxs_tax_subposttype.
* Fixed error when swapping genericlistitems (gallery)