Going live with new pictures and thubnails
trying to merge master onto gh-pages