more compile fixes
more code
Merge branch 'master' of github.com:veltzer/demos

Conflicts:
	java/ant/solutions/ch7/exercise-1/common.v2/src/ch7/HelloWorld.java