refactored server and client actors
Merge pull request #12 from yzernik/socket_manager_refactor

refactored server and client actors