Refactored into server and client
Remove Class module
Merge branch 'master' into devel

Conflicts:
	server/src/lib/HydraNet/t/Hydra.t
	server/src/lib/common/SqlEngine2/lib/DBlogs
Merge pull request #2 from jenniferliddle/master

trying to merge master and devel