Removed dependency from bp_includes.model.User

New implementation of pull request #235