Making investor filter dependent on time and security filters
Merge branch 'awesome' into testing