fixing up PictureTest
fixed merge conflicts in picture test
picture icons and fav icons show in list views. Pictures work. Todo: shrink
combining picture stuff with elastic search stuff

Merge remote-tracking branch 'upstream/elasticSearchDev' into elasticSearchDev-josh
resolved conflicts with pictures and geo
Merge pull request #302 from jivedesign/elasticSearchDev-josh

Elastic search dev josh