Captions now appear below pictures in the gallery and disappear and reappear with their respective categories
Merge branch 'rawilder' into integration