reomved doC() on the linux machine
Merge branch 'master' into LinuxBranchB

Conflicts:
	DemoProject/src/com/relix/demo/Demo.java