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
Fixed 2 failing migrations.
Added Выбрать button in _word_picker_modal.

Also update word_picker.js to handle that button.
Added words[entry.word] checking for nil in import_lexicon.rake.

It fails in clear database because words is not contain anything.
Checking words for nil prevents this.
Set AllowClose to true in editor.js#wordPickerDialog.
Merge pull request #34 from sld/feature/choice-and-cancel-buttons

Feature/choice and cancel buttons
Merge branch 'develop' into merit

Conflicts:
	db/schema.rb
Merge branch 'merit' into develop
Show statistics on the profile page
Add links to users
Deploy staging from develop again
Add /en
Show statistics to the general public