Update media query variables
Merge branch 'master' into ie8-support

Conflicts:
	sass/core/_base.scss