Removed filters
Merge branch 'Feature_Edge_4' into develop
Merge branch 'develop' of https://github.com/informaticslab/apollo into develop