filtering events by timeframe
Merge remote-tracking branch 'origin/master'

Conflicts:
	workshop/www/js/controllers/EventListController.js
filtering events by timeframe