two taxonomy voccabularies and update order content type
Merge branch 'master' of https://github.com/ban6ka/photo-film