added bower.json
Merge branch 'dev'