Merge branch 'master'
Characteristic
delete platypus.xml
Revert "delete platypus.xml"

This reverts commit 5a378755732e00972c843a14475c6992a6eec018.
delete platypus.xml (reverted from commit 5a378755732e00972c843a14475c6992a6eec018)
Delete platipus.xml
Async
addings Characteristics
Import changes
db migrate