Merge pull request #487 from ontohub/480-gsub_error_when_accessing_link

fix to_s of Links to use new iri-syntax
Merge branch 'staging' into augmenting361_private_repositories

Conflicts:
	app/controllers/categories_controller.rb
	app/controllers/license_models_controller.rb
Merge branch 'augmenting361_private_repositories' into develop

Conflicts:
	app/controllers/categories_controller.rb
	app/controllers/license_models_controller.rb
Merge branch 'develop' into develop.ontohub.org