Merge branch 'master' into staging

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/ontology/import.rb