Merge branch 'develop'

* develop:
  - Fixed issue with bower and npm packages
- Changed package names