Include dist/bower_components for dist
Merge branch 'develop'