Added new Battle and BattleMeta models. Not yet implemented.
Merge remote-tracking branch 'origin/master'