active record sortable fix
Merge branch 'origin/dev'