ajax changes
Merge branch 'master' of https://github.com/pulsarhealthcare/halloween

Conflicts:
	ajax.php