OresomeBattles 3.0 changes
Merge branch '3.0'