Add ES6
Use some ES6
Use more ES6
Merge branch 'feature/es6' into develop
Add support for time-based filtering