Merge pull request #3 from wasinger/2.3

[2.3] some changes to RestControllerGenerator