Merge pull request #1 from tangsomnang/master

Get questions with inner Options
POS preparing for release
POS preparing for release
[maven-release-plugin] prepare release service-survey-11
[maven-release-plugin] prepare for next development iteration
Merge pull request #2 from sosandstrom/master

Rebase from trunk