Merge branch 'develop' into relations

Conflicts:
	src/qpaweb/static/css/thakulf.css
	src/qpaweb/static/quiver.html
Merge remote-tracking branch 'origin/relations' into relations

Conflicts:
	src/qpaweb/static/quiver.html
	src/qpaweb/static/quiverpanel.js