Added the catapult class and added catapult related variables to Config and Drive
Merge origin/master