Changed some fields in Batting
Added more jars to lib
Fix merge