2.0 RC0.2

Fixed merge problems
Added per boss immunities