Merge branch 'add_jquery_sortable'