updated JS

Conflicts:
	www/js/netteForms.js