Add dev 4 from ps1
Merge remote-tracking branch 'origin/dev' into ps1 dev

Conflicts:
	HelloWorld/src/Hello.java