added path variables

escaped some variables
rollup to the current version
Merge branch 'master' into feature/cleanup

...and done a new cleanup
cleanup
removed "" in find -exec
Merge branch 'feature/cleanup' into develop
Merge branch 'release/1.1'