Merge branch 'master' of github.com:jesseyv/trailers

Conflicts:
	trailers_shop/apps/customshop/models.py
	trailers_shop/apps/customshop/urls.py
	trailers_shop/apps/customshop/views.py