Work in progress
Work in progress
Merge branch 'master' into bug7

Conflicts:
	server/build.cmd
Add "clean" to build.
Merge branch 'master' into bug7

Conflicts:
	build.cmd
Statistics added.
Merge branch 'master' of https://github.com/cashto/resistance