Merge branch 'develop' of https://github.com/eliranmal/cloudify-widget-modules into develop

Conflicts:
	cloudify-widget-hp/pom.xml
	cloudify-widget-hpcloudcompute/src/test/java/cloudify/widget/hpcloudcompute/HpCloudGrizzlyTest.java
	cloudify-widget-hpcloudcompute/src/test/resources/hpcloudcompute-grizzly-context.xml