Added characteristic

app/models/characteristic.js

@@ -0,0 +1,11 @@
+import DS from 'ember-data';
+import Ember from 'ember';
+
+export default DS.Model.extend({
+  characteristicName: DS.attr(),
+  characteristicTypeId: DS.attr(),
+  measurements: DS.hasMany('measurement', {async: true}),
+  createdAt: DS.attr('date'),
+  updatedAt: DS.attr('date'),
+  deletedAt: DS.attr('date')
+});

app/models/measurement.js

@@ -10,6 +10,7 @@ export default DS.Model.extend({
   notes: DS.attr(),
   testMethodId: DS.attr(),
   strain: DS.belongsTo('strain', {async: true}),
+  characteristic: DS.belongsTo('characteristic', {async: true}),
   createdAt: DS.attr('date'),
   updatedAt: DS.attr('date')
 });

app/templates/strain.hbs

@@ -55,17 +55,13 @@
     <div class="grid-1">
       <div class="span-1">
         <fieldset class="flakes-information-box">
-          <legend>{{id}}</legend>
-          <div class="grid-9">
-            <dl class="span-3">
-              <dt>Characteristic</dt>
-              <dd>{{characteristicId}}</dd>
-            </dl>
-            <dl class="span-3">
+          <legend>{{characteristic.characteristicName}}</legend>
+          <div class="grid-8">
+            <dl class="span-4">
               <dt>Text Measurement Type</dt>
               <dd>{{textMeasurementTypeId}}</dd>
             </dl>
-            <dl class="span-3">
+            <dl class="span-4">
               <dt>Text Value</dt>
               <dd>{{txtValue}}</dd>
             </dl>