Library-application
Merge branch 'devel' of https://github.com/koulutuksenpilvivayla/pilvivayla-basaari into devel

Conflicts:
	sites/basaar/settings.py
	sites/basaar/urls.py
Added checkout