fix logic nil test
Merge branch 'staging' into 746-default_distributed_logic

Conflicts:
	spec/models/ontology_spec.rb
fix logic test description
fix syntax error: add end keyword
remove dead code: DOL logic is only applied in one place
move expect into it-block for onto-controller spec

expect (and also response) should only be used inside of
an examples. Examples are the content of `it`-blocks.
`context`-blocks do not represent examples.
Merge pull request #808 from ontohub/fix_ontologies_controller_spec

move expect into it-block for onto-controller spec
Merge pull request #804 from ontohub/746-default_distributed_logic

746 default distributed logic
Merge branch 'staging' into develop

Conflicts:
	spec/controllers/ontologies_controller_spec.rb
	spec/models/ontology_spec.rb
Merge branch 'develop' into develop.ontohub.org