Merge branch 'master' into develop

* master:
  Initial commit
- Fixed issue with bower and npm packages
Merge branch 'develop'

* develop:
  - Fixed issue with bower and npm packages