XLCLOUD-929 Create j2ee web application cookbook
XLCLOUD-846 minor changes in VCD and Apps catalog entries to make the demo look better
Merge branch 'master' of gitorious.ow2.org:~xlcloud-continuous-integration/xlcloud/vcms-ci

Conflicts:
	database/vcms_drop_and_create_db.sql
Merge branch 'master' of gitorious.ow2.org:~xlcloud-continuous-integration/xlcloud/vcms-ci