Added/Updated overlay filtering logic;
Merge branch 'develop' of github.com:parworks/PARWorks-iOS into develop