adding bower_components manually
Merge branch 'master' into release/1.0