Correctly mark the project as requiring Django 1.7
Fix getting payment total in index view
Merge pull request #231 from elwoodxblues/fix/payment-total

Fix getting payment total in index view
Merge branch 'master' of github.com:elwoodxblues/saleor into feature/running-out-products

Conflicts:
	saleor/dashboard/views.py
	saleor/settings.py
Remove unused import