Added env debugging
Merge branch 'master' of https://github.com/mrcrgl/django-marclab

Conflicts:
	database/database.sqlite