Merge origin/master

Conflicts:
	wp-content/themes/wordpress-bootstrap-master/library/css/bootstrap.css
Merge origin/master

Conflicts:
	wp-content/themes/wordpress-bootstrap-master/library/css/bootstrap.css