Merge pull request #168 from yggie/develop

fix for regenerate_slugs not working for Users
fix for internal server error