jnr changes
fixed merge conflicts
fixed merge conflicts
Merge branch 'master' of github.com:fin-ger/cg-st-adv
Merge branch 'master' of github.com:fin-ger/cg-st-adv
Merge branch 'master' of github.com:fin-ger/cg-st-adv