changing MachineOptions to use "tag" instead of name. name is automatically generated.
Merge branch 'master' of https://github.com/evgenyf/cloudify-widget-modules

Conflicts:
	.gitignore
	cloudify-widget-softlayer/src/main/java/cloudify/widget/softlayer/SoftlayerCloudServerApi.java
	cloudify-widget-softlayer/src/main/java/cloudify/widget/softlayer/SoftlayerCloudUtils.java
fixing dependencies
fixing dependencies
fixing
fixing somethign something
Merge remote-tracking branch 'upstream/master'

Conflicts:
	cloudify-widget-ec2/src/main/java/cloudify/widget/ec2/Ec2CloudServerApi.java
Merge remote-tracking branch 'upstream/master'

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