Merge branch 'master' into tree

Conflicts:
	HelloWorld.java

Signed-off-by: sergio5990 <sergio5990kruk@gmail.com>
Merge branch 'master' into tree

Conflicts:
	HelloWorld.java

Signed-off-by: sergio5990 <sergio5990kruk@gmail.com>
new
 function
Conflicts:
	HelloWorld.java
456343