As per suggestion from jamesward (see
https://github.com/webjars/x-editable-bootstrap/pull/2), keep the
-SNAPSHOT in the version element.
Resolve merge conflict
Update .gitignore
Bump upstream.version to 1.4.6
Merge pull request #3 from Magrath/master

Bump upsteam.version to 1.4.6