Finalizing some changes.
Merging with andrew's branch.
fixing merge error
merged
fixing merge error 2
applying the changes and fixes applied on 2014-10-10 to make 6 clients properly communicate with each other