Switches from SHA-256 to BCrypt for user password hashing, and consolidates the USER table's password and salt columns into one.
Merge remote-tracking branch 'origin/master'