fix grid extras setup
Merge branch 'master' into modular

Conflicts:
	css/screen.css