Fix #244, Fix #247, Change 'Show Library' to 'Show Library/YouTube Search'
Merge branch 'master' into dev