main method
Merge branch 'master' into development

Conflicts:
	HelloWorld.java