Started work on Faucet Net 2
Merge branch 'faucetnet1'

Conflicts:
	faucetnet.ged