Bump the version number
Fix conflict in bower.json