Working on c_client, fixed some minor gameplay issues
Merge remote-tracking branch 'upstream/master'