Model deprecation / consolidation
Model deprecation / consolidation
Revert "Storage Modules"

This reverts commit 06496f269581f6f3c940449e30797bb9549bb6ce.
Revert "Revert "Storage Modules""

This reverts commit 5aea50be4497f296f14bc526ee880e42f785dd5f.
Revert "Revert "Revert "Storage Modules"""

This reverts commit b00fcd91c3786296172922c9f541595ea19e22d8.
Model deprecation / consolidation
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
README update (license)
Merge pull request #110 from Olympic1/master

Update README (license)