XLCLOUD-829 - Layout of GUI
Merge branch 'master' of gitorious.ow2.org:~xlcloud-continuous-integration/xlcloud/vcms-ci
XLCLOUD-829 - Layout of GUI
XLCLOUD-848 fix null pointer on template editor
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