Allow antivirus nto pass non scanned files to void issues when editing
files, mainly with CAD and MS Office files
moved fiel to correct path
up changelog
Merge branch 'jag/3.3-captiveportal-packaging' into 3.3
Merge branch 'jbahillo/clamav-samba' into 3.2

Conflicts:
	main/samba/ChangeLog
Fixed crash when editing view in Summarized Report
Merge branch '3.2' into 3.3

Conflicts:
	main/samba/ChangeLog
GPOs model add/edit/delete actions work again

Now the row ids are valid HTML identifiers
Fix reverting resolvconf configuration after domain join
Merge branch 'scabrero/samba-revert-dns-after-join' into 3.3

Conflicts:
	main/samba/ChangeLog
Merge branch '3.3' into ejhernandez/fix-ajax-edit-GPO
Make GPO scripts models work again
Fix GPO models UI
Merge pull request #1136 from Zentyal/ejhernandez/fix-ajax-edit-GPO

Fix GPO models UI
Merge branch '3.3' into scabrero/samba-seize-fsmo-roles

Conflicts:
	main/samba/ChangeLog