instruction corrected.
Merge branch 'development'

Conflicts:
	app/views/mapping/id_to_label.html.erb
	app/views/mapping/term_to_id.html.erb