Gems updated
Switched from .rvmrc to .ruby-version and .ruby-gemset
Migrations merged
Instance methods do not have to be defined inside of an included block.
Merge branch 'master' into display_of_symbols
Moved jquery-rails into asset group.
Merge branch 'master' into display_of_symbols
Rake task import:xml_files:again to import latest versions of ontologies' XML files again.
Test display_of_axioms on travis.
Verbose on import:xml_files:again.
rails_config and exception_notification added
Footer added
Capistrano removed, will be restored in the deployment branch.
Revert "Capistrano removed, will be restored in the deployment branch."

This reverts commit 53cacd694ed31d42ea292fffef8cbf3c56eeb2ba.
Switched to Ruby 2.0.0
new ontohub architecture diagram
Switched to a bootstrap fork with javascript fixes.
Merge branch 'deployment' into staging

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/ontology/import.rb