Merge pull request #108 from gsbodine/mbda-develop

Merge mbda-develop into MBDA - RC1