Merge branch 'staging' into augmenting189_search_ontologies_by_category

Conflicts:
	app/helpers/navigation_helper.rb
	app/models/category.rb
	app/views/shared/_navbar.html.haml
rename the method for related ontologies in the rails-way
refactor related_ontology method
Merge branch 'augmenting189_search_ontologies_by_category' of github:ontohub/ontohub into augmenting189_search_ontologies_by_category
Fixed ontology unit test.
Merge branch 'augmenting189_search_ontologies_by_category' of github.com:ontohub/ontohub into augmenting189_search_ontologies_by_category
seedfile for projects for has_and_belongs_to_many

Conflicts:
	db/seeds/008-projects.rb
Merge branch 'augmenting189_search_ontologies_by_category' of github:ontohub/ontohub into augmenting189_search_ontologies_by_category
fixing view of licensmodels

Conflicts:
	app/views/license_models/index.html.haml
Removed unused files generated by scaffolding.
A little refactoring.
fix factory to generate valid ontologyname.
add missing query_string to TestRequest

a valid request has a query_string method to
extract the Query String. The standard TestRequest
does not have such a method (although the controller relies on it),
so this adds it.
add tests for iri-based ontology routing.
Merge branch 'staging' into completing333_do_not_fragment_urls
One link for sign in/up and no extra forms.
Merge branch 'staging' into augmenting189_search_ontologies_by_category
Collapse navbar at 992px (necessary for menu with categories), moved admin menu to session dropdown.
Merge pull request #466 from ontohub/augmenting189_search_ontologies_by_category

Browsing of categories and containing ontologies. Fixes #189.
Save some chars with attr_writer in ActionController::TestRequest.