rebuild working properly now
Merge remote-tracking branch 'upstream/master'

Conflicts:
	cloudify-widget-hpcloud/src/main/java/cloudify/widget/hpcloud/NovaCloudCredentials.java
Merge remote-tracking branch 'eliranm/master'
some changes were done for softlayer implementation
two tests/configurations for HP cloud: folson and grizzly added, ssh connection has retries now, functionality of IP association was added got HP cloud grizzly
changed ssh connection implementation, Guice is not used anymore
Merge remote-tracking branch 'eliranm/master'

Conflicts:
	cloudify-widget-softlayer/src/main/java/cloudify/widget/softlayer/SoftlayerCloudServerApi.java
	cloudify-widget-softlayer/src/main/java/cloudify/widget/softlayer/SoftlayerConnectDetails.java
	cloudify-widget-softlayer/src/test/java/cloudify/widget/softlayer/SoftlayerNonDestructiveOperationsTest.java
Merge remote-tracking branch 'upstream/master'

Conflicts:
	cloudify-widget-ec2/src/main/java/cloudify/widget/ec2/Ec2MachineOptions.java
	cloudify-widget-pool-manager-website/pom.xml
Merge remote-tracking branch 'upstream/manager-website'

Conflicts:
	cloudify-widget-ec2/src/main/java/cloudify/widget/ec2/Ec2MachineOptions.java
	cloudify-widget-pool-manager-website/pom.xml
adding pool settings loader, using custom json type deserializer
adding pool manager deserializer test
pool manager - fixing provider settings broken references when deserializing subtypes, instantiation done from spring configuration, test updated, code refactored.
merging changes from upstream
Merge branch 'master' into manager-website

Conflicts:
	cloudify-widget-ec2/src/main/java/cloudify/widget/ec2/Ec2MachineOptions.java
added get status to pool manager and added test.
deleted hp-cloud module as redundant. adding ec2 support in pool settings.
initial commit for db operations for pool and account, all operations are working properly besides updatePool() that should be implemented
initial commit for db operations for pool and account, all operations are working properly besides updatePool() that should be implemented
added asserts to test
implemented updatePool() method, test added
merged