fixed weird merge
still fixing weird merge
still fixing weird merge
Updated the Release Notes and Home Page to match the recent changes made to Production
Merge branch 'master' into Istimulus-Tstimulus

Conflicts:
	property_page_ephys.php