Copy bower.json to dashboard branch
Deleted bower.json from render branch
Merge branch 'render'
Merge branch 'dashboard'