Updates the Device and DeviceModel with new attributes

- The attributes as mentioned in the email thread
  "Triplet- unique instrument, time, location"
Merge pull request #549 from ooici/triplet

Updates the Device and DeviceModel with new attributes