rescue added
Merge branch 'development'
destroy action added
Merge branch 'development'