fixed dev bundles
Merge branch 'develop'