updated to latest master-dev, refactored the deploy framework