incremental
Merge branch 'develop' of https://github.com/flitbit/FlitBit.Data into develop
incremental; continued work on many-to-many mapping