added bcma app and models for app
resolved merge conflicts for model changes