fix #939
bump for tests
add changelog entries
resolve conflict
Merge pull request #947 from mapbox/style-from-src

fix #939