update versions
move some modules from main to contrib
Merge branch 'master' into jacalvo/3.2-rc1
Merge branch 'master' into jacalvo/3.2-rc1
fixed kernel package name
fixed debian/changelog version
Merge pull request #581 from Zentyal/jacalvo/3.2-rc1

Jacalvo/3.2 rc1