Merge branch '2.3', remote branch 'upstream/2.3' into 2.3
Don't wrap returned objects in array. Fixed some doc comments.
Merge pull request #3 from wasinger/2.3

[2.3] some changes to RestControllerGenerator