Added dutch (The Netherlands = nl) translation files
Merge pull request #242 from iamit/master

Added dutch (The Netherlands = nl) translation files
Fixing some spanish translations
Fixing some spanish translations
Merge pull request #250 from jjimenezlopez/fixing_spanish_translations

Fixing spanish translations
Add BaseCart.is_empty property to enable override

It is used in get_or_create_cart() function to decide
if cart from session should be used or new cart should be created.
Merge pull request #254 from jacekmitrega/cart-is-empty

Add BaseCart.is_empty property to enable override
Fixed some typos and standardized the documentation.
Add a Bitdeli badge to README
Merge pull request #259 from bitdeli-chef/master

Add a Bitdeli Badge to README
Merge pull request #258 from oubiga/master

Fixed some typos and standardized the documentation.
Added ProductListView with get_queryset to filter out inactive products. Updated catalog urls to use it.
Added ProductListViewTestCase to tests/views.py. Added import for test case in tests/__init__.py.
Merge pull request #260 from evandempsey/fixes

Created ProductListView to filter out inactive products.
Update documentation

How to avoid ImproperlyConfigured exceptions when extending the Product model

Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
Merge pull request #263 from mkoistinen/issue_160_documentation

Update documentation
Merge https://github.com/divio/django-shop

Merge from upstream