Changed from PHP5.5 hashing to bcrypt for compatibility
Merge branch 'password-hashing'