merge

All Acceptance Criteria Met, password fields on "script.sql" and "script-test-h2.sql" changed to use new BCrypt method of hashing