added authz configuration
Merge branch 'master' into jgarcia/openchange-with-mysql

Conflicts:
	main/openchange/ChangeLog
	main/openchange/src/EBox/OpenChange/Model/Provision.pm
	main/samba/ChangeLog
Merge pull request #985 from Zentyal/jgarcia/openchange-with-mysql

openchange with mysql
Added last update and errors to ha dashboard widget
Merge pull request #986 from Zentyal/ejhernandez/ha-dashboard-widget

Added last update and errors to ha dashboard widget
fixed typo
fixed indentation of file
removed innecary semicolomn in try/catch block
Fix tab selection in tabbed composite from URL path anchor

For instance, /Maintenance/Events#ConfigureDispatchers goes directly to that composite
Merge pull request #987 from Zentyal/ejhernandez/fix-select-tab-in-URL-anchor

Fix tab selection in tabbed composite from URL path anchor
Merge branch 'jag/avoid-check-usercorner-warn'
Merge branch '3.2' into 3.3

Conflicts:
	main/core/ChangeLog
	main/openchange/ChangeLog
	main/openchange/debian/precise/changelog
Merge branch '3.3'
Merge branch 'master' into figarocorso/ha-refactor
Added some space between summary and errors at cluster summary
check of nginx include done as root
enabled back autodiscovery
Fix when upgrading ha module
Added replicating state when saving changes after replication

This helps to not commit suicide when restarting ha module due to network changes
restart haproxy when rpcproxy service status change