Merge branch 'release/0.3.0' into develop
Merge branch 'hotfix/0.3.1' into develop
added wercker.yml file
Merge branch 'develop'