Merge branch 'master' into develop
add bower json
Merge branch 'bower'