Merge origin/master

Conflicts:
	wp-content/themes/wordpress-bootstrap-master/single-flat.php
Merge origin/master

Conflicts:
	wp-content/themes/wordpress-bootstrap-master/single-flat.php