Merge branch 'master' of https://github.com/telefonicaid/fiware-sdc into develop

Conflicts:
	rest-api/src/main/resources/logback.xml
adding methods for checking the node in the puppet master and that the
recipe has been executed
creatinog of puppet node
change installator with puppet
change times
work towards reviewer commetns
work towards comments
comments
Merge branch 'bug/puppetnodedeploy_63' of https://github.com/telefonicaid/fiware-sdc into bug/frommaster

Conflicts:
	core/src/main/java/com/telefonica/euro_iaas/sdc/dao/impl/ChefNodeDaoRestImpl.java
node rest merge
Merge branch 'bug/puppetnodedeploy_63' of https://github.com/telefonicaid/fiware-sdc into bug/frommaster
comments
comments
comments
Merge branch 'develop' of https://github.com/telefonicaid/fiware-sdc into bug/frommaster

Conflicts:
	core/src/main/java/com/telefonica/euro_iaas/sdc/installator/impl/InstallatorPuppetImpl.java
	core/src/test/java/com/telefonica/euro_iaas/sdc/installator/InstallatorPuppetTest.java
	rest-api/src/main/resources/logback.xml
Merge branch 'bug/puppetnodedeploy_63' of https://github.com/telefonicaid/fiware-sdc into bug/frommaster

Conflicts:
	core/src/main/java/com/telefonica/euro_iaas/sdc/installator/impl/InstallatorPuppetImpl.java
Merge pull request #67 from hmunfru/bug/frommaster

Bug/frommaster