Merge branch 'lexi' into pat

Conflicts:
	FCO3.dev
	Makefile.win
Only include windows.h on Windows
Merge remote-tracking branch 'origin/lexi' into pat

Conflicts:
	FCO3.dev
	Makefile.win
	dbconn.c
Fix conflicts in testreport module