Same suit combat

Force updated by Jenkins build 2014-11-17_08-40-55