Code Refactoring and added client quit handler
Merge branch 'Developer' of github.com:gametechnology/psi-2013 into Developer