XLCLOUD-869 enable 'save' button on cancelling of image upload
removed some unnecessary TODOs to clean up the code...
XLCLOUD-851 Application Form improvement
Merge branch 'master' of gitorious.ow2.org:~xlcloud-continuous-integration/xlcloud/vcms-ci
XLCLOUD-869 minor corrections
Merge branch 'master' of gitorious.ow2.org:~xlcloud-continuous-integration/xlcloud/vcms-ci

Conflicts:
	vcms-gui/web/src/main/webapp/resources/css/custom.css