Merge branch 'hotfix/1.6.5'
Change to use bower to manage js dependencies
Merge branch 'hotfix/1.7.0' into develop