Merge branch 'java' of git.nikiroo.be:workspace/template