Remove edict
Update termprop
Update termprop/canossa
Update termprop
Merge branch 'develop'
Update version
Merge branch 'develop'