Added MagicalRecord
Remade inventory to use MagicalRecord
Merge remote-tracking branch 'origin/master'