Merge origin/master

Conflicts:
	wp-content/themes/wordpress-bootstrap-master/partial-project_frontpage.php