Merge remote-tracking branch 'remotes/origin/master' into angular
prep for search panel; prep for volume save; tweak resource cache towards more extensible pattern
Merge branch 'angular' of https://github.com/databrary/play into angular