[IDETesting]Second commit on testbranch branch
Merge branch 'testbranch'

Conflicts:
	src/com/example/helloworld/HelloWorld.java