removed active record sortable from dependency
Merge branch 'origin/dev'