Service and controller classes for Questions + minor corrections.
Merge remote-tracking branch 'master/master'
Merge remote-tracking branch 'master/master'