Better prefix for user configuration redis keys
fixed maximum users check when not using cloud sync
Fixed path escape on Reporter::SambaDiskUsage, thanks to Eddie A  for this fix
Merge pull request #407 from Zentyal/cperez/max-users-fix

fixed maximum users check when not using cloud sync
Don't allow to move read-only rows
Merge pull request #408 from Zentyal/jag/core-notmove-ro-rows

Don't allow to move read-only rows
Merge branch '3.0'

Conflicts:
	main/remoteservices/ChangeLog
	main/users/ChangeLog
fixed changelog
Merge branch 'jag/remoteservices-path-sambadiskusage'

Conflicts:
	main/remoteservices/ChangeLog
releasing core 3.1.4
 A solitary row could not be moved in any table
Merge branch 'jag/core-no-move-unique-row'

Conflicts:
	main/core/ChangeLog
bump version of zenbuntu-desktop to 3.1
fixed changelog format
Syntax fixes
Merge pull request #411 from Zentyal/scabrero/syntax-fixes

Syntax fixes
Merge branch 'master' into cperello/trafficshaping-improvements
Fixes to the initial implementation after some QA