All Inclusive Pricing (#209) and Combined Energy and Power Pricing (#208)
Merge branch 'pricing' into develop
Timezone pricing Issue #207
Merge branch 'tzs' into develop
Update licensing info for some source java files
Consumption models and Mongo conversion casts
Hotfix for new activity modeling
Merge pull request #52 from cassandra-project/develop

Develop