comparing dev and mockups workflow and making fixes
Merge pull request #1484 from reciprocity/feature/workflow-dev-fix

comparing dev and mockups workflow and making fixes