added license and author informations to VCD catalog initial data scripts
Merge branch 'master' of gitorious.ow2.org:~xlcloud-continuous-integration/xlcloud/vcms-ci
Merge branch 'master' of gitorious.ow2.org:~xlcloud-continuous-integration/xlcloud/vcms-ci
XLCLOUD-829 - Layout of GUI
Merge branch 'master' of gitorious.ow2.org:~xlcloud-continuous-integration/xlcloud/vcms-ci
XLCLOUD-829 - Layout of GUI
XLCLOUD-879 added template based on chef-solo
Merge branch 'master' of gitorious.ow2.org:~xlcloud-continuous-integration/xlcloud/vcms-ci
Merge branch 'master' of gitorious.ow2.org:~xlcloud-continuous-integration/xlcloud/vcms-ci
Merge branch 'master' of gitorious.ow2.org:~xlcloud-continuous-integration/xlcloud/vcms-ci

Conflicts:
	database/vcms_drop_and_create_db.sql
XLCLOUD-918 added missing id to checkbox admins-group
XLCLOUD-918 added missing id to checkbox admins-group
added missing ids to some components in imageNew.xhtml
Merge branch 'master' of gitorious.ow2.org:~xlcloud-continuous-integration/xlcloud/vcms-ci
Merge branch 'master' of gitorious.ow2.org:~xlcloud-continuous-integration/xlcloud/vcms-ci