Cleaner JSON representation of quiver.
Merge remote-tracking branch 'origin/relations' into relations

Conflicts:
	src/qpaweb/static/quiverpanel.js