Merge branch 'master' of https://github.com/danisaurus/shift-api
added an active column to triggers
Merge pull request #19 from danisaurus/data_analysis

Data analysis