Merge origin/master

Conflicts:
	wp-config.php
	wp-content/themes/wordpress-bootstrap-master/front-page.php
	wp-content/themes/wordpress-bootstrap-master/functions.php
	wp-content/themes/wordpress-bootstrap-master/header.php
	wp-content/themes/wordpress-bootstrap-master/library/css/bootstrap.css
	wp-content/themes/wordpress-bootstrap-master/library/less/navbar.less
	wp-content/themes/wordpress-bootstrap-master/library/less/variables.less
Merge origin/master

Conflicts:
	wp-config.php
	wp-content/themes/wordpress-bootstrap-master/front-page.php
	wp-content/themes/wordpress-bootstrap-master/functions.php
	wp-content/themes/wordpress-bootstrap-master/header.php
	wp-content/themes/wordpress-bootstrap-master/library/css/bootstrap.css
	wp-content/themes/wordpress-bootstrap-master/library/less/navbar.less
	wp-content/themes/wordpress-bootstrap-master/library/less/variables.less