update on image and spira
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/javascripts/report_detail.js.coffee
	app/views/execution/show.html.erb