* Parachute spell is now blizzlike * Also restored "The battle will begin in 2 minutes." (cherry picked from commit 8a4afad63ac97b39f6746d466f3166eeef62e711) Conflicts: sql/updates/world/2015_05_01_00_world.sql src/server/game/Miscellaneous/Language.h Rename 2015_05_01_00_world.sql to 2015_06_13_00_world.sql (cherry picked from commit 74eeefa5be163a55489f91c05d7dfd1cb624c78d)