Removed no longer necessary jQuery noConflict()
Fixed recursive bug that tried to add two times the same  interface to InterfaceRates model
small refactoring
Update ExternalRules.pm

Removed commented out code
Update ExternalRules.pm
Merge pull request #420 from Zentyal/jag/trafficshaping-syncrows-bug

 	Fixed recursive bug that tried to add two times the same interface to rates model
update installer to the new styles and bump version to 3.1-2
Better check for ipv6 presence before disabling it
group type can be changed in edit group
fixed edit group style adding table
hide default group
add group by default when ou=Groups is selected

usability improvement
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
added cancel button to users delete object dialogs
more jQuery -> $ replacements after multiou changes
Merge pull request #431 from Zentyal/jacalvo/multiou

Jacalvo/multiou
Merge branch 'jacalvo/jquery-noconflict'

Conflicts:
	main/users/src/templates/deluser.mas
Merge branch 'jag/network-disable-ipv6'

Conflicts:
	main/network/ChangeLog
Merge branch 'master' into scabrero/samba-gpos

Conflicts:
	main/core/src/templates/ajax/treeView.mas