Merge branch 'master' of https://github.com/dafyd/angular-mapbox
Merge branch 'master' of https://github.com/dafyd/angular-mapbox