Merge pull request #210 from fgiannar/develop

Develop
Merge pull request #211 from fgiannar/develop

Issues #203, close #192
Progress in issues #198 and #203: stripping containsAppliances in the deep copy of an ActivityModel and add deep copy from ActivityModel to Activity
Merge branch 'develop' of https://github.com/cassandra-project/platform into develop
Merge pull request #47 from cassandra-project/develop

Develop