Same suit combat

Force updated by Jenkins build 2014-11-16_19-31-53