did a bit of cleanup for camera
merged mine with yours
Merge remote-tracking branch 'upstream/elasticSearchDev' into elasticSearchDev
Merge remote-tracking branch 'upstream/elasticSearchDev' into elasticSearchDev
Merge remote-tracking branch 'upstream/elasticSearchDev' into elasticSearchDev
fixed the quality of pic a bit
Merge remote-tracking branch 'upstream/elasticSearchDev' into elasticSearchDev
Merge pull request #335 from rjynn/elasticSearchDev

Elastic search dev
Merge branch 'elasticSearchDev' of https://github.com/CMPUT301F14T03/lotsofcodingkitty
fixed bugs with question and answer images, can't click image without pic
Fixed bug with checking the geolocation
Merge pull request #336 from jivedesign/elasticSearchDev

fixed bugs with question and answer images, can't click image without pi...
Merge branch 'elasticSearchDev' of https://github.com/CMPUT301F14T03/lotsofcodingkitty