WFSOOZ-2 #done typo in ctl
Merge branch 'master' of https://github.com/bermud/wfs110

Conflicts:
	web/test.txt