Merge pull request #1041 from Zentyal/jag/fix-go-to-last-page

Fix calculation of page number when using go to last page control
fixed lower case mac in authorization package
Changed the way in which we restart dansguardian to update (possible) new config
Updated EBox::Samba::Users::setCredentials to stop using the lazy flag
Stop changing users and contacts' cn field on object edition, allowed to edit the displayName field, just as Windows does
Revert "added missing dep"

This reverts commit bc0603188f2795442f8ebd83ea113262ddd29187.
Revert "temporary removal of automatic remoteservices selection"

This reverts commit c8f5d09688882649eb2ec9cb3a08dbd2b2d05137.
Merge pull request #1043 from Zentyal/cperello/user-fixes

Cperello/user fixes
Merge pull request #1044 from Zentyal/ejhernandez/revert-clamav-xs-include-unit-tests

Revert "added missing dep"
nut init.d script renamed to nut-server in saucy
Allow antivirus nto pass non scanned files to void issues when editing
files, mainly with CAD and MS Office files
Fixed disabling ports from the API
First steps to readd port handling form in webserver using haproxy as its backend
better dbg
Merge pull request #1039 from Zentyal/scabrero/samba-fix-access-denied

Scabrero/samba fix access denied
Merge branch '3.2' into 3.3

Conflicts:
	main/squid/debian/precise/changelog
Merge branch '3.3'

Conflicts:
	extra/scripts/zentyal-unit-tests
	main/openchange/ChangeLog
	main/openchange/debian/changelog
	main/samba/ChangeLog
	main/samba/debian/control
differentiate zentyal-webmail and zentyal-sogo icons
fixed session id generation
remove debug