Event has Conference ID

Added said field and copied to server too
Merge remote-tracking branch 'origin/master'

Conflicts:
	Client/Event.h
Merge branch 'master' of https://github.com/clethrill/sys-dev