fixed merge code typo in js and added some missing semicolomns for style purposes
Merge pull request #837 from Zentyal/jag/core-typo-js

fixed merge code typo in js and added some missing semicolomns for style...
Allow to use vdomains table when module is unconfigured
update installer splash image
fixed package description style
Merge branch '3.2'

Conflicts:
	main/openchange/debian/precise/control
fixed wrong variable regression
Merge branch '3.2'
fix image format
cleaner generation of locale.gen
Merge pull request #838 from Zentyal/jag/mail-vdomains-remove-preconditions

Allow to use vdomains table when module is unconfigured
updated openchange icon
Fixed regression in authorization restricted by group

(cherry picked from commit dbb2b5eb099a0368a1d4b6f0d6426e6d0f426d5b)

Conflicts:
	main/captiveportal/ChangeLog
	main/captiveportal/src/EBox/CaptivePortal.pm
	main/captiveportal/src/EBox/CaptivePortal/Auth.pm
added changelog entry to zenbuntu-core
set version to service pack
wizard forms review
mail info hidden from migration progress
Revert "Fixed regression in authorization restricted by group"

This reverts commit ee8c4e95af5f985dabd25cbe7951afa32caa4d55.
Merge branch '3.2'

Conflicts:
	extra/installer/build_cd.conf
	extra/installer/zenbuntu-core/debian/changelog
styles fix