-merged
Merge branch 'master' of https://github.com/mmonti/bt-parent.git
- changes to the model