Merge branch 'dev' of https://github.com/Computing-works/pine into dev

Conflicts:
	pine/urls.py