change bower.json
Merge branch 'dev' into design