Resolving conflicts in merge
Trash article functionality
Merge branch 'trashArticle'
Adding filter line