Added confID to setConf
Merge remote-tracking branch 'origin/master'

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