Fix template bug in wishlist detail page
Merge branch 'feature/catalogue-faceting' of https://github.com/laidibug/django-oscar into projects/butik-shop-0.6-patched
Merge branch 'projects/butik-shop-0.6-patched' of https://github.com/okfish/django-oscar into feature/demo-multipayment-with-faceted-catalogue

Conflicts:
	oscar/templates/oscar/customer/wishlists/wishlists_detail.html
Merge branch 'feature/catalogue-faceting' into projects/butik-shop
Introducing show_zeros value for OSCAR_SEARCH_FACETS for more flexible facet handling. It allows to construct faceted filters even with zero results.
Fix JSON serialisation problem with AJAX basket

six.moves.map returns itertools.imap which won't serialize to JSON.
This commit unpacks the list into a normal list of strings to circumvent
the issue.
Rename AJAX helper method

The `to_json` method returns a dict, not a string!
Merge branch 'master' of https://github.com/tangentlabs/django-oscar into feature/demo-multipayment-with-faceted-catalogue
Merge commit '7aae332b5216001a7252c9328d5bf274d4222357' into feature/demo-multipayment-with-faceted-catalogue
Playing around faceted catalogue views based on Ashia's (@laidibug) branch (commit: 0dbd554d87051783180fc56391d0d6d28fab3615). With respects to :)

There are some enhancements for Demo-site:

- first attempt to implement multi-payment: 4 way, cash, invoice, paypal and datacash. Last two inherited, yep. In early development.

- search_index and schema.xml extended with some fields:
	size - for clothings to demonstrate grouped product attributes extraction;
	author - to  show how to make alphabeted list of values;
	and binding/publisher as an example of product attribute values collecting
You need to add that fields in your settings.OSCAR_SEARCH_FACETS.
(that was a tricky at the first view, FACET_ATTR_IDS is a hack, ugly but works)

-facet.py knows about "show_zero" field in OSCAR_SEARCH_FACETS and collects zero-counted results from haystack for more flexible facet handling in templates.
You need to add that key in your settings.OSCAR_SEARCH_FACETS['fields'].

- templates adjusted to show alphabeted list of book's authors. Needs futher css-ing.
Merge branch 'feature/demo-multipayment-with-faceted-catalogue' of https://github.com/okfish/django-oscar into feature/demo-multipayment-with-faceted-catalogue