Added display of artifacts
Merge branch 'artifacts' into dev

Conflicts:
	minion/frontend/static/js/minion-main.js