task force styles
Merge branch 'refs/heads/master' into test

Conflicts:
	themes/president/css/local.styles.css