Merge branch 'master' of https://github.com/guy-mograbi-at-gigaspaces/cloudify-widget-modules

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/evgenyf/cloudify-widget-modules

Conflicts:
	cloudify-widget-ec2/src/main/java/cloudify/widget/ec2/Ec2CloudServerApi.java