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
Merge pull request #297 from jivedesign/elasticSearchDev-josh

Elastic search dev josh
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
now loads all  questions and loads more when clicked.
Merge remote-tracking branch 'upstream/elasticSearchDev' into elasticSearchDev
Merge pull request #307 from rjynn/elasticSearchDev

now loads all questions and loads more when clicked
when adding question, it goes to top of list now.
Merge pull request #308 from rjynn/elasticSearchDev

when adding question, it goes to top of list now.
fixed bug where answer wasn't showing up
Merge pull request #309 from rjynn/elasticSearchDev

fixed bug where answer wasn't showing up
Merge branch 'master' of https://github.com/CMPUT301F14T03/lotsofcodingkitty into elasticSearchDev
Merge branch 'elasticSearchDev' of https://github.com/CMPUT301F14T03/lotsofcodingkitty into elasticSearchDev