bower init
updated package.json
Merge branch 'develop'