updated mongoid sortable relation version, removed dead code
Merge branch 'origin/dev'