Merge branch 'master' into bridgestreet
Re-indent
Merge pull request #105 from luciddesign/facebook-album

Facebook album