improved event multiplexer
Merge branch 'master' into feature/synchronousEventDemultiplexer

Conflicts:
	framework/framework.vcxproj
Added reference to framework project in the server project
Merge pull request #12 from tekniskit/feature/synchronousEventDemultiplexer

Changes to project structure