Removed no longer necessary jQuery noConflict()
Merge branch 'jacalvo/multiou' into jacalvo/jquery-noconflict

Conflicts:
	main/captiveportal/ChangeLog
	main/core/ChangeLog
	main/core/www/js/dialog.js
	main/mail/ChangeLog
	main/network/ChangeLog
	main/remoteservices/ChangeLog
more jQuery -> $ replacements after multiou changes
Merge branch 'jacalvo/jquery-noconflict'

Conflicts:
	main/users/src/templates/deluser.mas