Fix for "Since we use cookies - add notification about it #3" https://github.com/koulutuksenpilvivayla/pilvivayla-basaari/issues/3
Merge branch 'devel' of https://github.com/koulutuksenpilvivayla/pilvivayla-basaari into devel

Conflicts:
	sites/basaar/settings.py