Merge pull request #79 from cassandra-project/develop

get updates
closes #290

Update activity models for exclusive/concurrent appliances
closes #356

Remove Maximum Power field from the form of Maximum Power Pricing scheme
Merge pull request #357 from fgiannar/develop

close #356 #290