do not wrap userfields; sbkopi needs similar elements for logged in and not logged in users
Merge branch 'release/7.x-0.17' into develop
merge conflict
Refactoring for openagency 2.6 (branchName)
Merge branch 'develop' into feature/762_sbkopi
user branchShortName in favourite list
Merge branch 'feature/762_sbkopi' into develop
updated to version 7.x-0.18
Merge branch 'release/7.x-0.18'