Update package name and version number in NPM and Bower config files
Merge branch 'dev'