Merge pull request #31 from SmartCat/gaf_4_develop

Fixed timeline actions
* Fixed masked timelines
- Improved filters calculation
Merge pull request #7 from CatalystApps/gaf_4_develop

Gaf 4 develop