Merge branch ‘dev_wj’ of https://git.trustie.net/forge01/mydemo2 into develop
Conflicts:
    helloWorld.java