use bower.js as a package manager
modify bower.json
Merge branches 'master' and 'resolve-dependency'