test
Merge branch 'lissdy'

Conflicts:
	modules/10_ironmine_irm/app/views/irm/api_tools/console.html.erb