Support for editing score in list view
Merge remote-tracking branch 'upstream/master'