[UPDATE] adding bower
Merge branch 'development'
Merge branch 'master' into development