added OrderExtraInfo form to the checkout selection view
Merge pull request #201 from alesdotio/master

Added extra info form to checkout
added SHOP_PRICE_FORMAT setting for the priceformat template filter
updated changelog
Merge branch 'master' of github.com:divio/django-shop
fixed mistake in docs, thanks to @singold for pointing it out #193
updated docs with various small additions
Updating and completing Spanish translation files
order_ and cart_ required decorators now accept a url name instead
Merge pull request #203 from bsnux/spanish_translations

Updating and completing Spanish translation files
added Arturo to translators
updated translation files
Update CHANGELOG.rst
version bump 0.1.2
switch to dev version
Merge branch 'master' of github.com:divio/django-shop
added a new property to product, which is checked before adding it to the cart
added test case for adding inactive product
fixed old tests to use active products
updated changelog