Try Merit
Show the level, too
Deploy staging from merit
Invoke root_path on authentication failure
Temporarily raise an exception when a synset is locked for editing
It was a type okay
Merge branch 'develop' into merit

Conflicts:
	db/schema.rb
Merge branch 'merit' into develop