seedfile for projects for has_and_belongs_to_many
Removed unused files generated by scaffolding.

Conflicts:
	app/assets/stylesheets/categories.css.scss
	app/controllers/categories_controller.rb
add ontology type text to ontology view
Merge branch 'staging' into augmenting228_domain_field_properties

Conflicts:
	app/controllers/categories_controller.rb
	app/views/license_models/index.html.haml
	app/views/ontologies/_info.html.haml
add ontology type view
add missing files of ontology type view
add ontology type select box to ontology edit view
make ontology type of ontology editable
Merge branch 'augmenting228_domain_field_properties' into develop

Conflicts:
	app/models/ontology.rb
	app/views/ontologies/edit.html.haml