use bower
Merge branch 'develop'