Added Mana, added magic and spells
Merge remote-tracking branch 'origin/master'