Add dev 6
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	HelloWorld/src/Hello.java