Merge pull request #1 from ivg/adding-bap-types

Merged bap_types into bap_core
Merge remote-tracking branch 'upstream/master'