Merge branch 'develop'
Added bundle file to build script and podspec.
Merge branch 'master' into develop