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