[UPDATE] added bower support
Merge branch 'development'
Merge branch 'master' into development