Merge remote-tracking branch 'upstream/master'
Make prettyPhoto a feature, add slideshow for albums.
Typo in page_display
Merge remote-tracking branch 'upstream/master'
New mail_list template.
Merge pull request #45 from beardy-unixer/master

Album slideshows