jq
Merge remote-tracking branch 'origin/master'

Conflicts:
	layout/css/style2.css