Add WikiPaintings image loading to tweet pages
Merge remote-tracking branch 'upstream/master' into wikipaintings
Merge branch 'https-flickr' of git://github.com/hugovk/Tweetian into master
Fixes 9eaf0ee for Harmattan
Merge remote-tracking branch 'upstream/master'