Better markup in album view

* article, not div
* images are in a ul
Merge branch 'ul-in-album-view' into 4.1