Pull BattleCardView into master repository

Pull BattleCardView into master repository