changing NPMFactory
new checkstyle that uses spaces rather than tabs
Merge branch 'master' of https://github.com/choreos/choreos_middleware

Conflicts:
	DeploymentManager/src/main/java/org/ow2/choreos/deployment/nodes/NPMFactory.java