-Added entity and block registry classes to manage mapping of game types to API types

-Changed object managers to use new registry classes
Merge remote-tracking branch 'upstream/master'