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
Fixed log change
Merge pull request #303 from cchan5/master

Fixed log change
resolved conflicts with pictures and geo
Merge pull request #302 from jivedesign/elasticSearchDev-josh

Elastic search dev josh
upvoting for questions and answers added, as well as sorting
Update PostController.java
Merge pull request #306 from tbrockman/elasticSearchDev

upvoting for questions and answers added, as well as sorting
Merge remote-tracking branch 'upstream/elasticSearchDev' into elasticSearchDev