Deleted database.yml, let travis use database.example.yml.
fixed bug with the children tab

when clicked on children tab the sub bar disapeard
this is fixed now
merge conflict in Gemfile.Lock resolved
resolve issue with unexpected render of oops

Since 185cd7e06b128d814fd9dcb8a10c65739547a1f2
the oops-partial was rendered always and not only
in the cases in which #oops_supported? returned
true.
Merge branch 'staging' into issue190-optimize_ontology_title_bar
Renamed database.example.yml to database.yml again.
Renamed database.example.yml to database.yml again.
Merge branch 'staging' into issue190-optimize_ontology_title_bar
Fixed menu buttons in ontology title bar.
fix 237; less space between text and names of axioms
Merge branch 'staging' into issue190-optimize_ontology_title_bar
Merge pull request #221 from ontohub/issue190-optimize_ontology_title_bar

Optimize ontology title bar. (Merged issue190-... into staging.) Fixes #190.
add factory for DO with defined links.
add tests for DO-specific graphdata-fetching.
Merge branch origin/master into augmenting112...

Merge remote-tracking branch 'origin/master' into augmenting112_ontology_link_graph
do not display symbols-tab for DOs.
do not redirect to non-existent symbols for DOs.
Merge augmenting_improve... into augmenting161...

Merge remote-tracking branch 'origin/augmenting_improve_interface_design' into augmenting161_show_do_membership
display parent DO for Ontologies

- Display the defining Distributed Ontology
  for an Ontology directly under the headline.
Merge branch 'staging' into augmenting112_ontology_link_graph

Conflicts:
	app/views/ontologies/_info.html.haml
	test/factories/ontology.rb