Merge branch 'master' into 310

Conflicts:
	src/game/Unit.cpp
	src/shared/Database/SQLStorage.cpp

src/game/DBCStructure.h

@@ -1293,6 +1293,9 @@ struct SpellEntry
     //uint32    spellMissileID;                             // 230      m_spellMissileID not used
     //uint32  PowerDisplayId;                               // 231 PowerDisplay.dbc, new in 3.1
 
+    // helpers
+    int32 CalculateSimpleValue(uint8 eff) const { return EffectBasePoints[eff]+int32(EffectBaseDice[eff]); }
+
     private:
         // prevent creating custom entries (copy data from original in fact)
         SpellEntry(SpellEntry const&);                      // DON'T must have implementation