Merge branch 'hotfix/1.0.2'
modified the shippable.yml to include just the master branch
Merge branch 'hotfix/1.0.3' into develop