Fixing a crash when deleting condition
Merge branch 'dev' of https://github.com/i-score/i-score into dev
Merge branch 'dev' of https://github.com/i-score/i-score into dev