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

Elastic search dev
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
fixed bugs with question and answer images, can't click image without pic