temporary fix test for catalog mechanism #181
Merge branch 'develop' into staging to fix remaining tests (#387)

Conflicts:
	app/models/ontology.rb
add "history of this file/directory" link to the views
Merge branch 'augmenting_add_history_link_from_files_and_dirs' into develop