allow remove file type association
Merge branch 'develop'