cleanup
Merge branch 'develop' into feature/rel_links

Conflicts:
	sandman/model/__init__.py
	sandman/model/models.py
	sandman/templates/resource.html