[ALIEN-494] - fixed unable to override a war file on a WAR Node
updating poms for 0.2.4-SNAPSHOT development
updating develop poms to master versions to avoid merge conflicts
Merge branch 'master' into develop
Updating develop poms back to pre merge state
trying to run tests in parallel
updating alien4cloud dependency version in pom.xml
fixed cloudify url in tests
refactoring AlienUtils and ToscaUtils
improve logging for storage shutdown
- added support for a deletable blockStorage type
- refactor artifactCopy
[ALIEN-516] ability to provide a custom script for handling the creation and configuration of a blockstorage type
improve log in test
improve log in test
improve log in test
ALIEN-51 : As a User I want Alien 4 Cloud's cloudify2 driver to support Network
[ALIEN-530] ability to provide custom destroy script for a block-storage
ALIEN-51 : As a User I want Alien 4 Cloud's cloudify2 driver to support Network
temp commit for merge
Merge branch 'develop' of https://github.com/vuminhkh/alien4cloud-cloudify2-provider into develop

Conflicts:
	src/main/java/alien4cloud/paas/cloudify2/ComputeTemplateMatcher.java
	src/main/java/alien4cloud/paas/cloudify2/PaaSResourceMatcher.java
	src/main/java/alien4cloud/paas/cloudify2/generator/RecipeGenerator.java
	src/main/java/alien4cloud/paas/cloudify2/matcher/ComputeTemplateMatcher.java