Merge branch 'master' into matching

Conflicts:
	geordi/geordi/data/model/editor.py
	geordi/geordi/data/model/entity.py
	geordi/geordi/data/model/raw_match.py
	geordi/geordi/frontend/views.py