Further work on the property system + Started adding Devices
Merge remote-tracking branch 'origin/master'