Bump version number
Finished merge
Add bower.json
Fix merge conflicts related to bumping of version number
Update contributors to latest
Merge branch 'hotfix/update-contributors' into develop