refactored
Merge branch 'refs/heads/master' into orig

Conflicts:
	assets/css/_global.scss
	calendar.html
fixed globals
Merge branch 'refs/heads/orig'
created mobile icon only version of the calendar filter