Merge entity and property model
Created by: markatk
The context broker only send entities with all attributes. By merging the entity and property model the ember data model will be more similar to the context broker data.
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information