changed delete message
Merge branch 'master' into sub_resources