Merge origin/master

Conflicts:
	wp-content/themes/wordpress-bootstrap-master/about-us-page.php
	wp-content/themes/wordpress-bootstrap-master/footer.php
	wp-content/themes/wordpress-bootstrap-master/front-page.php
	wp-content/themes/wordpress-bootstrap-master/our-product-page.php
	wp-content/themes/wordpress-bootstrap-master/partial-project_frontpage.php
	wp-content/themes/wordpress-bootstrap-master/row_row.php
	wp-content/themes/wordpress-bootstrap-master/template-my_preferences.php
Merge origin/master

Conflicts:
	wp-content/themes/wordpress-bootstrap-master/about-us-page.php
	wp-content/themes/wordpress-bootstrap-master/footer.php
	wp-content/themes/wordpress-bootstrap-master/front-page.php
	wp-content/themes/wordpress-bootstrap-master/our-product-page.php
	wp-content/themes/wordpress-bootstrap-master/partial-project_frontpage.php
	wp-content/themes/wordpress-bootstrap-master/row_row.php
	wp-content/themes/wordpress-bootstrap-master/template-my_preferences.php