added bower.json
merge bower.json-s