Merge branch ‘staging’
# Conflicts:
# .htaccess
# wp-content/themes/withum/css/style.css
# wp-content/themes/withum/css/style.css.map
# wp-content/themes/withum/js/main.js
# wp-content/themes/withum/js/main.js.map
# wp-content/themes/withum/single.php
# wp-content/themes/withum/templates/t2-services.php