fixing up PictureTest
fixed merge conflicts in picture test
picture icons and fav icons show in list views. Pictures work. Todo: shrink
Merge pull request #296 from pachalad/elasticSearchDev

Elastic search dev
combining picture stuff with elastic search stuff

Merge remote-tracking branch 'upstream/elasticSearchDev' into elasticSearchDev-josh
Push to server functionality
Pulling from server

Merge branch 'elasticSearchDev' of https://github.com/CMPUT301F14T03/lotsofcodingkitty into elasticSearchDev
Updated geolocation in mainactivity and dialog box works.
Merge pull request #297 from jivedesign/elasticSearchDev-josh

Elastic search dev josh
Merge pull request #300 from cchan5/master

Updated geolocation in mainactivity and dialog box works.
Answers and comments can now add location
Added city name attri to Geo model, and ViewQuestion displays the location
Location now shows in the main list
Merge pull request #301 from cchan5/master

Added geolocation for answers and comments.
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