Apply patch from 67d68d9 by Salja for druid enrage and make druids in combat

I applied Saljas patch and made the druid's enter combat when they use the spell, will exit combat a few seconds afterwards as it usually is. Sorry for the big mess with the commits.