Added ability to also include in playlist result from query based on albums (album_query parameter).
Attempt to factorize duplicate code
Merge pull request #595 from brilnius/spl_album_query

smartplaylist album_query parameter