update from adt 4
Merge remote-tracking branch 'origin/master'

Conflicts:
	HelloJava/src/org/sweetsmile/practice/Hello.java