Cookie import view
Merge branch 'master' of github.com:muffins-on-dope/bakery

Conflicts:
	bakery/cookies/views.py