Merge branch 'master' of https://github.com/javanarior/javanarior-build-resources