sync
Merge branch 'master' of github.com:cmartinez85/InstanceDeployer

Conflicts:
	deploy
reparar merge