Merge branch 'release/0.3.0' into develop
Merge branch 'master' into release/0.4.0
Bump version
XCode project fixes (happened after 5.1 upgrade)/
Merge branch 'release/0.4.0'