Update from template (auto-merged)#12

xdev-gh-bot merged 2 commits intomasterxdev-software/java-template:masterfrom

update-from-template-mergedxdev-software/java-template:update-from-template-mergedCopy head branch name to clipboard