Correctly sorting and reassigning IDs after drag/drop and file uploads
Merge remote-tracking branch 'origin/master'