Minor touch ups and preparing for raid, quest merge
Integrate raid, quest
Fix for scoring swapping attack/defense incorrectly
Add questId to args