m
Merge branch 'master' into local

Conflicts:
	HelloWorld/src/HelloGit.java
mjep