Merge branch 'master' of https://build.se.informatik.uni-kiel.de/iobserve-ui/frontend-prototype

app/components/architecture-visualisation-cytoscape/style.js

@@ -23,11 +23,17 @@ $node > node { /* compounds. "Nodes" in meta model. $ selects the parent node th
     padding-right: 10px;
     text-valign: top;
     text-halign: center;
+}
+
+[type="node"] {
     background-color: #CCC;
 }
 
-[type="red"] {
-    background-color: red;
+[type="nodeGroup"] {
+    background-color: white;
+    border-style: dotted;
+    border-color: #999;
+    border-width: 2px;
 }
 
 edge {

app/models/baseentity.js

@@ -3,5 +3,6 @@ import attr from 'ember-data/attr';
 
 export default Model.extend({
     // id: attr('string') - not allowed to be listed by ember
-    systemId: attr('string') 
+    systemId: attr('string'),
+    type: attr('string')
 });