resolving merge conflict
Merge branch '0.1' of github.com:robusta-code/rra into 0.1
completing JaxRsController