Added mr. cage & mr. bacon ID constants to Constants.h file
Merge remote-tracking branch 'origin'