Merge branch 'groovy_dev' of https://github.com/SimonEbner/ba into groovy_dev
Merge branch 'groovy_dev' into groovy