fixed height album-container
handle non-rectangle album-image
Merge branch 'master' into gh-pages