json view for questions/:id/show, tests
fix merge
Merge branch 'curiousepic-master'

all conflicts resolved.