sync
Merge remote-tracking branch 'origin/tal' into wes

Conflicts:
	assets/css/style.css