Siimple v1.6
Merge remote-tracking branch 'origin/master'

Conflicts:
	scss/_grid.scss