949_branchShortName
Merge branch 'release/7.x-0.14' into develop
Refactoring for openagency 2.6 (branchName)
test for branchName
test for branchName
make branchName private
mergeconflicts
correct way to get short name
merge conflicts
merge conflicts
updated to version 7.x-0.15
Merge branch 'release/7.x-0.15'