header
Merge branch 'master' of https://github.com/antoninab/wordpress

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