fix bug #2
Merge branch 'master' into CRUD

Conflicts:
	.rvmrc
	Gemfile.lock
Run registry:import from db:seed.
Test staging and deployment branches on travis.
Ontology Summit Hackathon discussion
work after Hackathon discussion
local and distributed inference
state at end of Hackathon
distributed inferences <-> local inference
Import logic graph
Read logic mappings from logic graph
localice supports, fixes #123
Merge branch 'CRUD' of github.com:ontohub/ontohub into CRUD
Add gemfile lock
Remove stub class
Global OopsPitfalls
quickfix
automatic reload oops_state see #143
popover with link fixes #143
Merge branch 'staging' into oops