fixed memory management system in client, got rid of linked list
Merge branch 'master' of https://github.com/rdryke/4061