Changed version in manifest to 0.15.0
Merge branch 'dev'
Merge branch 'master' into gh-pages