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

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