[dev] Merk patch

[Chuck Hagenbuch]

Quoting Duck <duck at obala.net>:

> - make item delivery non-required. Make it Boolean since we have only two
> options (default and non-default). This is not used anywhere.
> - added item_model field: stores product model IDs. Allows to   
> import/sync data
> from client based items databases/categories (bridge from merk to companies
> internal ids)
> - Categories: suppress errors if the current language used is not present in
> categories data (log error and return empty array)
> - deleted not used /templates/deliveries/edit.html
> - clean up and simplify templates: use more divs, styles, use stripe.js for
> lists

I haven't tested it, since I don't use Merk (yet), but it looks pretty  
good to me. I tweaked a few minor things and committed it. Thanks!

-chuck

-- 
"we are plastered to the windshield of the bus that is time." - Chris