change jb
Merge remote-tracking branch 'origin/ajax-testing' into ajax-testing

Conflicts:
	includes/footer_html.php