Adjusted gulp files, added custom taxonomies to work.php files
Resolve merge conflicts