init bower & npm
init bower & npm
Merge branch 'local'