added album playlist & album teaser
Merge branch 'master' into gh-pages