untabify and reformat
data in use warning for removal works again
mark action different of edit or del as unsupported case in dataInUse.mas
fixed bug which made impossible to recover row buttons after a canceled delete
up ChangeLog
removed debug and added new data in use support for change row operations
Merge pull request #881 from Zentyal/jag/ajax-data-in-use-fix

Fixed regression in AJAX changes with raised error when a  data in use exception was found
simplify dataInUse JS
fixed highlight of rows in dataInUser
Update install button when clicking select all checkbox
Merge pull request #883 from Zentyal/jgarcia/fix-select-all-checkbox

Update install button when clicking select all checkbox
Merge pull request #882 from Zentyal/jag/data-in-use-ajax-improvements

Use same JSON reply file for changeRowForm and dataInUse
releasing samba 4.1.4
Fix EBox::Types::Composite::cmp

To store changes when only last type is modified

(cherry picked from commit b4ad209843983eebbbb53cd40ee492ff20d04d8b)

Conflicts:
	main/core/ChangeLog
Merge branch '3.2' into 3.3

Conflicts:
	main/core/ChangeLog
Merge branch '3.3'

Conflicts:
	extra/samba4/debian/changelog
	main/core/ChangeLog
	main/software/ChangeLog