Updated JavaScript
Updated JavaScript
Merge remote-tracking branch 'origin/master'

Conflicts:
	wp-content/themes/holistichealth/custom/main-treatment-page.php
	wp-content/themes/holistichealth/header.php