Merge branch 'kovidgoyal/master'
Merge branch 'kovidgoyal/master'
In device view, make "waiting to sync" icon have precedence over "matched" icon
Merge pull request #32 from cbhaley/master

In device view: change so that "sync" icon has priority over "in library" icon