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 #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