added missing sails-mongo dependency
added account locking
merged confilcts