Added question and note REST resources.
Merge remote-tracking branch 'origin/development' into NIGEL_BRANCH